diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-08 17:55:17 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-08 17:55:17 +0000 |
| commit | 28b5296571c67d70d8808e2f80d2c3f51fba15b6 (patch) | |
| tree | 34122743cc05f7e84f179c2efe68956ff07c95f3 | |
| parent | 898dc25befe1d90e36e3735b011039745176e861 (diff) | |
Add configure options to allow hard-coded paths to be changed.MODULAR_COPY
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 25 |
3 files changed, 35 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2005-12-08 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * configure.ac: + Add configure options to allow hard-coded paths to be changed. + 2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org> * Makefile.am: diff --git a/Makefile.am b/Makefile.am index 0497064..1b4de74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,10 @@ bin_PROGRAMS = xman -xman_CFLAGS = $(XMAN_CFLAGS) -D_BSD_SOURCE -DHELPFILE=\"$(datadir)/xman.help\" +helpdir=@HELPDIR@ +dist_help_DATA = xman.help + +xman_CFLAGS = $(XMAN_CFLAGS) -D_BSD_SOURCE -DHELPFILE=\"$(helpdir)/xman.help\" xman_LDADD = $(XMAN_LIBS) xman_SOURCES = \ @@ -56,8 +59,6 @@ endif appman_PRE = \ xman.man -dist_data_DATA = xman.help - # App default files (*.ad) appdefaultdir = @appdefaultdir@ diff --git a/configure.ac b/configure.ac index ed1b831..658109a 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,31 @@ AC_CANONICAL_HOST AC_CHECK_FUNC([mkstemp], AC_DEFINE(HAS_MKSTEMP,1,[Define to 1 if you have the `mkstemp' function.])) +AC_ARG_WITH(helpdir, + AC_HELP_STRING([--with-helpdir=<path>], + [Set default directory for xman.help (default: ${datadir}/X11)]), + [HELPDIR="$withval"], + [HELPDIR=${datadir}/X11]) +AC_SUBST([HELPDIR]) + +AC_ARG_WITH(sysmanpath, + AC_HELP_STRING([--with-sysmanpath=<path>], + [Set default system man page search path]), + [SYSMANPATH="$withval"], []) +if test x$SYSMANPATH != x; then + AC_DEFINE_UNQUOTED(SYSMANPATH, "$SYSMANPATH", + [Default system man page search path (default: none)]) +fi + +AC_ARG_WITH(localmanpath, + AC_HELP_STRING([--with-localmanpath=<path>], + [Set default local man page search path]), + [LOCALMANPATH="$withval"], []) +if test x$LOCALMANPATH != x; then + AC_DEFINE_UNQUOTED(LOCALMANPATH, "$LOCALMANPATH", + [Default local man page search path (default: none)]) +fi + # Checks for pkg-config packages XAW_CHECK_XPRINT_SUPPORT(XMAN) |