s6

Mirror/fork of https://skarnet.org/software/s6/
git clone https://ccx.te2000.cz/git/s6
Log | Files | Refs | README | LICENSE

commit df6745f7e9bf9fe1050fe75d19a50c6e90e365a3
parent 71a5105be32cae6c1f7908f72d3562c3e9cc9ede
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Sun, 11 Sep 2016 11:03:52 +0000

 Remove irrelevant shebangdir option from configure

Diffstat:
Mconfigure | 7+------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/configure b/configure @@ -23,7 +23,6 @@ Fine tuning of the installation directories: --libexecdir=DIR package-scoped executables [EPREFIX/libexec] --libdir=DIR static library files [PREFIX/lib/$package] --includedir=DIR C header files [PREFIX/include] - --shebangdir=DIR absolute path for #! invocations [BINDIR] If no --prefix option is given, by default libdir (but not dynlibdir) will be /usr/lib/$package, and includedir will be /usr/include. @@ -133,7 +132,6 @@ bindir='$exec_prefix/bin' sbindir='$exec_prefix/sbin' libdir='$prefix/lib/$package' includedir='$prefix/include' -shebangdir='$bindir' sysdeps='$prefix/lib/skalibs/sysdeps' manualsysdeps=false shared=false @@ -162,7 +160,6 @@ for arg ; do --sbindir=*) sbindir=${arg#*=} ;; --libdir=*) libdir=${arg#*=} ;; --includedir=*) includedir=${arg#*=} ;; - --shebangdir=*) shebangdir=${arg#*=} ;; --with-sysdeps=*) sysdeps=${arg#*=} manualsysdeps=true ;; --with-include=*) var=${arg#*=} ; stripdir var ; addincpath="$addincpath -I$var" ;; --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; vpaths="$vpaths $var" ;; @@ -202,7 +199,7 @@ fi # Expand installation directories stripdir prefix -for i in exec_prefix dynlibdir libexecdir bindir sbindir libdir includedir shebangdir sysdeps sproot ; do +for i in exec_prefix dynlibdir libexecdir bindir sbindir libdir includedir sysdeps sproot ; do eval tmp=\${$i} eval $i=$tmp stripdir $i @@ -418,12 +415,10 @@ if $slashpackage ; then echo "#define ${package_macro_name}_BINPREFIX \"$binprefix/\"" echo "#define ${package_macro_name}_EXTBINPREFIX \"$extbinprefix/\"" echo "#define ${package_macro_name}_LIBEXECPREFIX \"$binprefix/\"" - echo "#define ${package_macro_name}_SHEBANGPREFIX \"$extbinprefix/\"" else echo "#define ${package_macro_name}_BINPREFIX \"\"" echo "#define ${package_macro_name}_EXTBINPREFIX \"\"" echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\"" - echo "#define ${package_macro_name}_SHEBANGPREFIX \"$shebangdir/\"" fi echo echo "#endif"