summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2015-07-21 01:10:52 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2015-07-21 01:10:52 +0000
commit668399dc50b344b877011dabc6b704ae0ae01859 (patch)
treea6c0b9064ade9964b2960a06765152ae3267a457
parentdbc98400a42cc68e6a06d4852d03c0f5db51e6ca (diff)
downloadexecline-668399dc50b344b877011dabc6b704ae0ae01859.tar.gz
execline-668399dc50b344b877011dabc6b704ae0ae01859.tar.xz
execline-668399dc50b344b877011dabc6b704ae0ae01859.zip
- new configure option: --shebangdir v2.1.3.0
 - skalibs dep bump
 - rc for 2.1.3.0
-rw-r--r--INSTALL2
-rwxr-xr-xconfigure9
-rw-r--r--doc/index.html4
-rw-r--r--doc/upgrade.html8
-rw-r--r--package/info2
5 files changed, 19 insertions, 6 deletions
diff --git a/INSTALL b/INSTALL
index 55adc19..235fccf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 4.0 or later
-  - skalibs version 2.3.5.1 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.3.6.0 or later: http://skarnet.org/software/skalibs/
 
  This software will run on any operating system that implements
 POSIX.1-2008, available at:
diff --git a/configure b/configure
index d8d62e8..4710a95 100755
--- a/configure
+++ b/configure
@@ -18,11 +18,12 @@ Installation directories:
 
 Fine tuning of the installation directories:
   --dynlibdir=DIR               shared library files [PREFIX/lib]
-  --bindir=DIR                  user executables [EPREFIX/bin]
+  --bindir=BINDIR               user executables [EPREFIX/bin]
   --sbindir=DIR                 admin executables [EPREFIX/sbin]
   --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.
@@ -132,6 +133,7 @@ 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
@@ -160,6 +162,7 @@ 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" ;;
@@ -201,7 +204,7 @@ fi
 
 # Expand installation directories
 stripdir prefix
-for i in exec_prefix dynlibdir libexecdir bindir sbindir libdir includedir sysdeps sproot skalibs ; do
+for i in exec_prefix dynlibdir libexecdir bindir sbindir libdir includedir shebangdir sysdeps sproot skalibs ; do
   eval tmp=\${$i}
   eval $i=$tmp
   stripdir $i
@@ -393,10 +396,12 @@ 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"
diff --git a/doc/index.html b/doc/index.html
index c955b2f..64fcfa7 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -52,7 +52,7 @@ shell's syntax, and has no security issues.
  <li> GNU make, version 4.0 or later. Please be aware that execline will
 not build with an earlier version. </li>
  <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.3.5.1 or later. It's a build-time requirement. It's also a run-time
+2.3.6.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
 </ul>
@@ -67,7 +67,7 @@ library. </li>
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of execline is <a href="execline-2.1.2.2.tar.gz">2.1.2.2</a>. </li>
+ <li> The current released version of execline is <a href="execline-2.1.3.0.tar.gz">2.1.3.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the execline git repository:
 <pre> git clone git://git.skarnet.org/execline </pre> </li>
 </ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 233f050..6a5f082 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,14 @@
 
 <h1> What has changed in execline </h1>
 
+<h2> in 2.1.3.0 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.3.6.0 </li>
+ <li> New configure option: <tt>--shebangdir</tt> for script creation
+automation. </li>
+</ul>
+
 <h2> in 2.1.2.2 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index b6faa04..b40d80f 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=execline
-version=2.1.2.2
+version=2.1.3.0
 category=admin
 package_macro_name=EXECLINE