diff options
| -rw-r--r-- | bootstrap.am | 3 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | doc/sciteco.1.in | 9 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
5 files changed, 20 insertions, 9 deletions
diff --git a/bootstrap.am b/bootstrap.am index f44f945..58a1aa1 100644 --- a/bootstrap.am +++ b/bootstrap.am @@ -11,7 +11,8 @@ SUBST_MACRO = eb$<\e \ <fs@PACKAGE_URL^Q@\e@PACKAGE_URL@\e;>j \ <fs@bindir^Q@\e$(bindir)\e;>j \ <fs@pkgdatadir^Q@\e$(pkgdatadir)\e;>j \ - <fs@scitecopathdir^Q@\e$(scitecopathdir)\e;>j \ + <fs@scitecolibdir^Q@\e$(scitecolibdir)\e;>j \ + <fs@DEFAULT_SCITECOPATH^Q@\e@DEFAULT_SCITECOPATH@\e;>j \ <fs@DATE^Q@\e$(shell @DATE@ "+%d %b %Y")\e;>j \ ew$@\e diff --git a/configure.ac b/configure.ac index fe492bc..ffdebcb 100644 --- a/configure.ac +++ b/configure.ac @@ -15,9 +15,9 @@ AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_BUILD AC_CANONICAL_HOST -# Standard macro path ($SCITECOPATH) -scitecopathdir=$datadir/$PACKAGE/lib -AC_SUBST(scitecopathdir) +# SciTECO library macro directory +scitecolibdir=$datadir/$PACKAGE/lib +AC_SUBST(scitecolibdir) # Checks for programs. LT_INIT @@ -152,6 +152,13 @@ esac AM_CONDITIONAL(INTERFACE_GTK, [test x$INTERFACE = xgtk]) +AC_ARG_WITH(default-scitecopath, + AS_HELP_STRING([--with-default-scitecopath=PATH], + [Specify the default value of the $SCITECOPATH variable + [default=DATADIR/sciteco/lib]]), + [DEFAULT_SCITECOPATH=$withval], [DEFAULT_SCITECOPATH=$scitecolibdir]) +AC_SUBST(DEFAULT_SCITECOPATH) + AC_ARG_ENABLE(bootstrap, AS_HELP_STRING([--enable-bootstrap], [Bootstrap using sciteco-minimal, diff --git a/doc/sciteco.1.in b/doc/sciteco.1.in index ea28c98..0c715ff 100644 --- a/doc/sciteco.1.in +++ b/doc/sciteco.1.in @@ -144,9 +144,9 @@ The following environment variables have a special meaning for Standard library macro path. Macros can expect to find standard library macros in this directory. -Therefore if undefined it defaults to the standard library -installation directory -.BR "@scitecopathdir@" . +It defaults to +.B "@DEFAULT_SCITECOPATH@" +(often the standard library path). . . .SH FILES @@ -158,6 +158,9 @@ Default profile macro. .B @pkgdatadir@/teco.ini Sample profile macro configuring commonly used run-time options and opening files specified as arguments. +.TP +.B @scitecolibdir@/... +Standard library macros. . . .SH BUGS diff --git a/lib/Makefile.am b/lib/Makefile.am index 1fba206..6bfb55a 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,2 +1,2 @@ -dist_scitecopath_DATA = lexer.tes fnkeys.tes +dist_scitecolib_DATA = lexer.tes fnkeys.tes diff --git a/src/Makefile.am b/src/Makefile.am index e3b5848..41bc7cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/bootstrap.am AM_CFLAGS = -Wall -std=c99 AM_CXXFLAGS = -Wall -AM_CPPFLAGS = -D'DEFAULT_SCITECOPATH="@scitecopathdir@"' +AM_CPPFLAGS = -D'DEFAULT_SCITECOPATH="@DEFAULT_SCITECOPATH@"' if NEED_COMPAT AM_CPPFLAGS += -I@top_srcdir@/compat endif |