diff options
| -rw-r--r-- | Makefile.in | 29 | ||||
| -rw-r--r-- | config.usage | 27 | ||||
| -rwxr-xr-x | configure | 84 |
3 files changed, 140 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 44e9159..bae3699 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,10 +54,24 @@ BINDIR = @bindir@ SBINDIR = @sbindir@ LIBDIR = @libdir@ INCLUDEDIR = @includedir@ +OLDINCLUDEDIR = @oldincludedir@ MANDIR = @mandir@ DOCDIR = @docdir@ LIBEXECDIR = @libexecdir@ +SYSCONFDIR = @sysconfdir@ +SHAREDSTATEDIR = @sharedstatedir@ +LOCALSTATEDIR = @localstatedir@ +RUNSTATEDIR = @runstatedir@ +DATAROOTDIR = @datarootdir@ +DATADIR = @datadir@ +INFODIR = @infodir@ +LOCALEDIR = @localedir@ +HTMLDIR = @htmldir@ +DVIDIR = @dvidir@ +PDFDIR = @pdfdir@ +PSDIR = @psdir@ + NATIVE_CC = @native_cc@ NATIVE_OS = @native_os@ NATIVE_OS_BITS = @native_os_bits@ @@ -347,11 +361,26 @@ clean: clean-implib @echo SBINDIR:' '$(SBINDIR) @echo LIBDIR:' '$(LIBDIR) @echo INCLUDEDIR:' '$(INCLUDEDIR) + @echo OLDINCLUDEDIR:' '$(OLDINCLUDEDIR) @echo MANDIR:' '$(MANDIR) @echo DOCDIR:' '$(DOCDIR) @echo LIBEXECDIR:' '$(LIBEXECDIR) @echo +.display-exdirs: + @echo SYSCONFDIR' '$(SYSCONFDIR) + @echo SHAREDSTATEDIR' '$(SHAREDSTATEDIR) + @echo LOCALSTATEDIR' '$(LOCALSTATEDIR) + @echo RUNSTATEDIR' '$(RUNSTATEDIR) + @echo DATAROOTDIR' '$(DATAROOTDIR) + @echo DATADIR' '$(DATADIR) + @echo INFODIR' '$(INFODIR) + @echo LOCALEDIR' '$(LOCALEDIR) + @echo HTMLDIR' '$(HTMLDIR) + @echo DVIDIR' '$(DVIDIR) + @echo PDFDIR' '$(PDFDIR) + @echo PSDIR' '$(PSDIR) + .display-build: @echo NATIVE_CC:' '$(NATIVE_CC) @echo NATIVE_OS:' '$(NATIVE_OS) diff --git a/config.usage b/config.usage index 8d002b7..ffc327c 100644 --- a/config.usage +++ b/config.usage @@ -14,10 +14,24 @@ supported switches: --sbindir --libdir --includedir + --oldincludedir --mandir --docdir --libexecdir + --sysconfdir + --sharedstatedir + --localstatedir + --runstatedir + --datarootdir + --datadir + --infodir + --localedir + --htmldir + --dvidir + --pdfdir + --psdir + --build --host --target @@ -61,6 +75,19 @@ supported variables: DOCDIR LIBEXECDIR + SYSCONFDIR + SHAREDSTATEDIR + LOCALSTATEDIR + RUNSTATEDIR + DATAROOTDIR + DATADIR + INFODIR + LOCALEDIR + HTMLDIR + DVIDIR + PDFDIR + PSDIR + CC CPP CXX @@ -44,10 +44,24 @@ init_vars() mb_sbindir=$SBINDIR mb_libdir=$LIBDIR mb_includedir=$INCLUDEDIR + mb_oldincludedir=$OLDINCLUDEDIR mb_mandir=$MANDIR mb_docdir=$DOCDIR mb_libexecdir=$LIBEXECDIR + mb_sysconfdir=$SYSCONFDIR + mb_sharedstatedir=$SHAREDSTATEDIR + mb_localstatedir=$LOCALSTATEDIR + mb_runstatedir=$RUNSTATEDIR + mb_datarootdir=$DATAROOTDIR + mb_datadir=$DATADIR + mb_infodir=$INFODIR + mb_localedir=$LOCALEDIR + mb_htmldir=$HTMLDIR + mb_dvidir=$DVIDIR + mb_pdfdir=$PDFDIR + mb_psdir=$PSDIR + # build mb_build=$BUILD @@ -161,11 +175,26 @@ common_defaults() [ -z "$mb_sbindir" ] && mb_sbindir=$mb_exec_prefix/sbin [ -z "$mb_libdir" ] && mb_libdir=$mb_exec_prefix/lib [ -z "$mb_includedir" ] && mb_includedir=$mb_prefix/include + [ -z "$mb_oldincludedir" ] && mb_oldincludedir=$mb_prefix/include [ -z "$mb_datarootdir" ] && mb_datarootdir=$mb_prefix/share [ -z "$mb_mandir" ] && mb_mandir=$mb_datarootdir/man [ -z "$mb_docdir" ] && mb_docdir=$mb_datarootdir/doc [ -z "$mb_libexecdir" ] && mb_libexecdir=$mb_exec_prefix/libexec + [ -z "$mb_sysconfdir" ] && mb_sysconfdir=$mb_exec_prefix/etc + [ -z "$mb_sharedstatedir" ] && mb_sharedstatedir=$mb_prefix/com + [ -z "$mb_localstatedir" ] && mb_localstatedir=$mb_prefix/var + [ -z "$mb_runstatedir" ] && mb_runstatedir=$mb_localstatedir/run + [ -z "$mb_datarootdir" ] && mb_datarootdir=$mb_prefix/share + [ -z "$mb_datadir" ] && mb_datadir=$mb_datarootdir + [ -z "$mb_infodir" ] && mb_infodir=$mb_datarootdir/info + [ -z "$mb_localedir" ] && mb_localedir=$mb_datarootdir/locale + [ -z "$mb_htmldir" ] && mb_htmldir=$mb_docdir + [ -z "$mb_dvidir" ] && mb_dvidir=$mb_docdir + [ -z "$mb_pdfdir" ] && mb_pdfdir=$mb_docdir + [ -z "$mb_psdir" ] && mb_psdir=$mb_docdir + + # build [ -z "$mb_build" ] && mb_build=$mb_default_build [ -z "$mb_host" ] && mb_host=$mb_default_host @@ -453,10 +482,24 @@ config_copy() -e 's^@sbindir@^'"$mb_sbindir"'^g' \ -e 's^@libdir@^'"$mb_libdir"'^g' \ -e 's^@includedir@^'"$mb_includedir"'^g' \ + -e 's^@oldincludedir@^'"$mb_oldincludedir"'^g' \ -e 's^@mandir@^'"$mb_mandir"'^g' \ -e 's^@docdir@^'"$mb_docdir"'^g' \ -e 's^@libexecdir@^'"$mb_libexecdir"'^g' \ \ + -e 's^@sysconfdir@^'"$mb_sysconfdir"'^g' \ + -e 's^@sharedstatedir@^'"$mb_sharedstatedir"'^g' \ + -e 's^@localstatedir@^'"$mb_localstatedir"'^g' \ + -e 's^@runstatedir@^'"$mb_runstatedir"'^g' \ + -e 's^@datarootdir@^'"$mb_datarootdir"'^g' \ + -e 's^@datadir@^'"$mb_datadir"'^g' \ + -e 's^@infodir@^'"$mb_infodir"'^g' \ + -e 's^@localedir@^'"$mb_localedir"'^g' \ + -e 's^@htmldir@^'"$mb_htmldir"'^g' \ + -e 's^@dvidir@^'"$mb_dvidir"'^g' \ + -e 's^@pdfdir@^'"$mb_pdfdir"'^g' \ + -e 's^@psdir@^'"$mb_psdir"'^g' \ + \ -e 's^@native_cc@^'"$mb_native_cc"'^g' \ -e 's^@native_os@^'"$mb_native_os"'^g' \ -e 's^@native_os_bits@^'"$mb_native_os_bits"'^g' \ @@ -546,6 +589,9 @@ for arg ; do --includedir=*) mb_includedir=${arg#*=} ;; + --oldincludedir=*) + mb_oldincludedir=${arg#*=} + ;; --mandir=*) mb_mandir=${arg#*=} ;; @@ -554,6 +600,44 @@ for arg ; do ;; + --sysconfdir=*) + mb_sysconfdir=${arg#*=} + ;; + --sharedstatedir=*) + mb_sharedstatedir=${arg#*=} + ;; + --localstatedir=*) + mb_localstatedir=${arg#*=} + ;; + --runstatedir=*) + mb_runstatedir=${arg#*=} + ;; + --datarootdir=*) + mb_datarootdir=${arg#*=} + ;; + --datadir=*) + mb_datadir=${arg#*=} + ;; + --infodir=*) + mb_infodir=${arg#*=} + ;; + --localedir=*) + mb_localedir=${arg#*=} + ;; + --htmldir=*) + mb_htmldir=${arg#*=} + ;; + --dvidir=*) + mb_dvidir=${arg#*=} + ;; + --pdfdir=*) + mb_pdfdir=${arg#*=} + ;; + --psdir=*) + mb_psdir=${arg#*=} + ;; + + # build --build=*) mb_build=${arg#*=} |