summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2008-07-30 13:47:04 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2008-12-01 10:15:42 -0800
commit1d2a0c58ffa7be9c47ea0a097f54e012cf5d44de (patch)
treed7c2a72929e0c839c3ab6a03f7860f669640fe1f
parentdcbbcb582cf712e59c1474632380943bea8f1a5e (diff)
Allow setting XORG_SGML_PATH to a non-default path when running configure
-rw-r--r--xorg-macros.m4.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
index 06f7c9d..cc04fa3 100644
--- a/xorg-macros.m4.in
+++ b/xorg-macros.m4.in
@@ -196,7 +196,9 @@ AC_SUBST([ADMIN_MAN_DIR])
# Whether or not the necessary tools and files are found can be checked
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
-XORG_SGML_PATH=$prefix/share/sgml
+if test x$XORG_SGML_PATH = x ; then
+ XORG_SGML_PATH=$prefix/share/sgml
+fi
HAVE_DEFS_ENT=
if test x"$cross_compiling" = x"yes" ; then
@@ -252,7 +254,9 @@ AC_SUBST(MAKE_HTML)
# indicates whether the necessary tools and files are found and, if set,
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
AC_DEFUN([XORG_CHECK_DOCBOOK],[
-XORG_SGML_PATH=$prefix/share/sgml
+if test x$XORG_SGML_PATH = x ; then
+ XORG_SGML_PATH=$prefix/share/sgml
+fi
HAVE_DEFS_ENT=
BUILDTXTDOC=no
BUILDPDFDOC=no