From 71a82dfd40ead666a9654742bc64701c23d9c963 Mon Sep 17 00:00:00 2001 From: midipix Date: May 24 2017 13:44:10 +0000 Subject: build system: added --sbindir support. --- diff --git a/Makefile.in b/Makefile.in index 73fd9b4..44e9159 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,6 +51,7 @@ ELF_CONFIG_DEFS = @elf_config_defs@ PREFIX = @prefix@ EXEC_PREFIX = @exec_prefix@ BINDIR = @bindir@ +SBINDIR = @sbindir@ LIBDIR = @libdir@ INCLUDEDIR = @includedir@ MANDIR = @mandir@ @@ -343,6 +344,7 @@ clean: clean-implib @echo PREFIX:' '$(PREFIX) @echo EXEC_PREFIX:' '$(EXEC_PREFIX) @echo BINDIR:' '$(BINDIR) + @echo SBINDIR:' '$(SBINDIR) @echo LIBDIR:' '$(LIBDIR) @echo INCLUDEDIR:' '$(INCLUDEDIR) @echo MANDIR:' '$(MANDIR) diff --git a/config.usage b/config.usage index 4a351e4..8d002b7 100644 --- a/config.usage +++ b/config.usage @@ -11,6 +11,7 @@ supported switches: --prefix --exec-prefix --bindir + --sbindir --libdir --includedir --mandir @@ -53,6 +54,7 @@ supported variables: PREFIX EXEC_PREFIX BINDIR + SBINDIR LIBDIR INCLUDEDIR MANDIR diff --git a/configure b/configure index 1c326f7..5aaaa2d 100755 --- a/configure +++ b/configure @@ -41,6 +41,7 @@ init_vars() mb_prefix=$PREFIX mb_exec_prefix=$EXEC_PREFIX mb_bindir=$BINDIR + mb_sbindir=$SBINDIR mb_libdir=$LIBDIR mb_includedir=$INCLUDEDIR mb_mandir=$MANDIR @@ -157,6 +158,7 @@ common_defaults() && mb_exec_prefix=$mb_prefix [ -z "$mb_bindir" ] && mb_bindir=$mb_exec_prefix/bin + [ -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_datarootdir" ] && mb_datarootdir=$mb_prefix/share @@ -448,6 +450,7 @@ config_copy() -e 's^@prefix@^'"$mb_prefix"'^g' \ -e 's^@exec_prefix@^'"$mb_exec_prefix"'^g' \ -e 's^@bindir@^'"$mb_bindir"'^g' \ + -e 's^@sbindir@^'"$mb_sbindir"'^g' \ -e 's^@libdir@^'"$mb_libdir"'^g' \ -e 's^@includedir@^'"$mb_includedir"'^g' \ -e 's^@mandir@^'"$mb_mandir"'^g' \ @@ -534,6 +537,9 @@ for arg ; do --bindir=*) mb_bindir=${arg#*=} ;; + --sbindir=*) + mb_sbindir=${arg#*=} + ;; --libdir=*) mb_libdir=${arg#*=} ;;