summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2016-04-20 17:52:25 -0400
committermidipix <writeonce@midipix.org>2016-04-21 03:06:03 -0400
commitb354be64f194e4fdb737602d1701995185d80d62 (patch)
tree227fadc91ccc37f5f93e6bec409035673210cdd2
parent587ad19ef2573d80421da715a5e65c98ffdd6834 (diff)
downloadntapi-b354be64f194e4fdb737602d1701995185d80d62.tar.bz2
ntapi-b354be64f194e4fdb737602d1701995185d80d62.tar.xz
build system: remove syslibdir support, fix related typo in config.usage.
-rw-r--r--Makefile.in2
-rw-r--r--config.usage3
-rwxr-xr-xconfigure6
3 files changed, 1 insertions, 10 deletions
diff --git a/Makefile.in b/Makefile.in
index 27194a6..4a91760 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -38,7 +38,6 @@ EXEC_PREFIX = @exec_prefix@
BINDIR = @bindir@
LIBDIR = @libdir@
INCLUDEDIR = @includedir@
-SYSLIBDIR = @syslibdir@
MANDIR = @mandir@
DOCDIR = @docdir@
LIBEXECDIR = @libexecdir@
@@ -241,7 +240,6 @@ clean:
@echo BINDIR:' '$(BINDIR)
@echo LIBDIR:' '$(LIBDIR)
@echo INCLUDEDIR:' '$(INCLUDEDIR)
- @echo SYSLIBDIR:' '$(SYSLIBDIR)
@echo MANDIR:' '$(MANDIR)
@echo DOCDIR:' '$(DOCDIR)
@echo LIBEXECDIR:' '$(LIBEXECDIR)
diff --git a/config.usage b/config.usage
index 6437f60..8544fbe 100644
--- a/config.usage
+++ b/config.usage
@@ -9,8 +9,8 @@ supported switches:
--bindir
--libdir
--includedir
- --syslibdir
--mandir
+ --docdir
--libexecdir
--build
@@ -32,7 +32,6 @@ supported variables:
BINDIR
LIBDIR
INCLUDEDIR
- LIBDIR
MANDIR
DOCDIR
LIBEXECDIR
diff --git a/configure b/configure
index ca10d90..504bfcb 100755
--- a/configure
+++ b/configure
@@ -34,7 +34,6 @@ init_vars()
mb_bindir=$BINDIR
mb_libdir=$LIBDIR
mb_includedir=$INCLUDEDIR
- mb_syslibdir=$LIBDIR
mb_mandir=$MANDIR
mb_docdir=$DOCDIR
mb_libexecdir=$LIBEXECDIR
@@ -114,7 +113,6 @@ common_defaults()
[ -z "$mb_bindir" ] && mb_bindir=$mb_exec_prefix/bin
[ -z "$mb_libdir" ] && mb_libdir=$mb_exec_prefix/lib
[ -z "$mb_includedir" ] && mb_includedir=$mb_prefix/include
- [ -z "$mb_syslibdir" ] && mb_syslibdir=/lib
[ -z "$mb_datarootdir" ] && mb_datarootdir=$mb_prefix/share
[ -z "$mb_mandir" ] && mb_mandir=$mb_datarootdir/man
[ -z "$mb_docdir" ] && mb_docdir=$mb_datarootdir/doc
@@ -342,7 +340,6 @@ config_copy()
-e 's^@bindir@^'"$mb_bindir"'^g' \
-e 's^@libdir@^'"$mb_libdir"'^g' \
-e 's^@includedir@^'"$mb_includedir"'^g' \
- -e 's^@syslibdir@^'"$mb_syslibdir"'^g' \
-e 's^@mandir@^'"$mb_mandir"'^g' \
-e 's^@docdir@^'"$mb_docdir"'^g' \
-e 's^@libexecdir@^'"$mb_libexecdir"'^g' \
@@ -406,9 +403,6 @@ for arg ; do
--includedir=*)
mb_includedir=${arg#*=}
;;
- --syslibdir=*)
- mb_syslibdir=${arg#*=}
- ;;
--mandir=*)
mb_mandir=${arg#*=}
;;