More build fixes

Signed-off-by: Laurent Bercot <ska@appnovation.com>

3 files changed, 20 insertions, 10 deletions

diff --git a/configure b/configure
index 0167a84..c7b4998 100755
--- a/configure
+++ b/configure
@@ -23,6 +23,7 @@ Fine tuning of the installation directories:
   --libexecdir=DIR              package-scoped executables [EPREFIX/libexec]
   --libdir=DIR                  static library files [PREFIX/lib]
   --includedir=DIR              C header files [PREFIX/include]
+  --sysconfdir=DIR              global configuration files [PREFIX/etc]
   --pkgconfdir=DIR              pkg-config .pc files [PREFIX/lib/pkgconfig]
 
  If no --prefix option is given, by default libdir (but not dynlibdir) will be
@@ -143,6 +144,7 @@ libexecdir='$exec_prefix/libexec'
 bindir='$exec_prefix/bin'
 libdir='$prefix/lib'
 includedir='$prefix/include'
+sysconfdir='$prefix/etc'
 pkgconfdir='$prefix/lib/pkgconfig'
 shebangdir='$bindir'
 sysdeps='$prefix/lib/skalibs/sysdeps'
@@ -180,10 +182,11 @@ for arg ; do
     --bindir=*) bindir=${arg#*=} ;;
     --libdir=*) libdir=${arg#*=} ;;
     --includedir=*) includedir=${arg#*=} ;;
+    --sysconfdir=*) sysconfdir=${arg#*=} ;;
     --pkgconfigdir=*) pkgconfigdir=${arg#*=} ;;
     --with-sysdeps=*) sysdeps=${arg#*=} manualsysdeps=true ;;
     --with-include=*) var=${arg#*=} ; stripdir var ; addincpath="$addincpath -I$var" ; depincpath="${depincpath}${depincpath:+ }-I$var" ;;
-    --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; deplibpath="${deplibpath}${deplibpath:+ }-I$var" ; vpaths="$vpaths $var" ;;
+    --with-lib=*) var=${arg#*=} ; stripdir var ; addlibspath="$addlibspath -L$var" ; deplibpath="${deplibpath}${deplibpath:+ }-L$var" ; vpaths="$vpaths $var" ;;
     --with-dynlib=*) var=${arg#*=} ; stripdir var ; addlibdpath="$addlibdpath -L$var" ; vpathd="$vpathd $var" ;;
     --with-pkgconfig=*) pkgconf=${arg#*=} ;;
     --with-pkgconfig) pkgconf=${PKG_CONFIG:-pkg-config} ;;
@@ -236,7 +239,7 @@ fi
 
 # Expand installation directories
 stripdir prefix
-for i in exec_prefix dynlibdir libexecdir bindir libdir includedir pkgconfdir sysdeps sproot  ; do
+for i in exec_prefix dynlibdir libexecdir bindir libdir includedir sysconfdir pkgconfdir sysdeps sproot  ; do
   eval tmp=\${$i}
   eval $i=$tmp
   stripdir $i
@@ -245,7 +248,7 @@ done
 # Process deps-build
 if test -n "$pkgconf" || $pcw || $slashpackage ; then
   oldifs="$IFS"
-  while IFS="	" read cond usedinlibs pkg ver libs ; do
+  while IFS=" 	" read cond usedinlibs pkg ver libs ; do
     IFS="$oldifs"
     eval "cond=$cond; usedinlibs=$usedinlibs"
     if $cond ; then
@@ -407,7 +410,7 @@ tryldflag LDFLAGS_AUTO -Wl,--sort-common
 CPPFLAGS_AUTO="${CPPFLAGS_AUTO}${addincpath}"
 
 if $evenmorestatic ; then
-  LDFLAGS_NOSHARED=-static
+  LDFLAGS_NOSHARED=" -static"
 fi
 
 if $shared ; then
@@ -423,6 +426,8 @@ else
   LDFLAGS_NOSHARED="${LDFLAGS_NOSHARED}${addlibdpath}"
 fi
 
+
+
 echo "Creating config.mak..."
 cmdline=$(quote "$0")
 for i ; do cmdline="$cmdline $(quote "$i")" ; done
@@ -441,6 +446,7 @@ libexecdir := $libexecdir
 bindir := $bindir
 libdir := $libdir
 includedir := $includedir
+sysconfdir := $sysconfdir
 pkgconfdir := $pkgconfdir
 sysdeps := $sysdeps
 slashpackage := $slashpackage
@@ -464,7 +470,7 @@ CFLAGS := ${CFLAGS}${CFLAGS_POST:+ }$CFLAGS_POST
 LDFLAGS_AUTO := $LDFLAGS_AUTO
 LDFLAGS := ${LDFLAGS}${LDFLAGS_POST:+ }$LDFLAGS_POST
 LDFLAGS_SHARED := $LDFLAGS_SHARED
-LDFLAGS_NOSHARED := $LDFLAGS_NOSHARED
+LDFLAGS_NOSHARED :=$LDFLAGS_NOSHARED
 CROSS_COMPILE := $cross
 
 vpath lib%.a$vpaths
@@ -522,16 +528,20 @@ EOF
 if $slashpackage ; then
   echo "#define ${package_macro_name}_BINPREFIX \"$bindir/\""
   echo "#define ${package_macro_name}_EXTBINPREFIX \"$extbinprefix/\""
+  echo "#define ${package_macro_name}_EXTLIBEXECPREFIX \"$extbinprefix/\""
 elif $abspath ; then
   echo "#define ${package_macro_name}_BINPREFIX \"$bindir/\""
   echo "#define ${package_macro_name}_EXTBINPREFIX \"$bindir/\""
+  echo "#define ${package_macro_name}_EXTLIBEXECPREFIX \"$libexecdir/\""
 else
   echo "#define ${package_macro_name}_BINPREFIX \"\""
   echo "#define ${package_macro_name}_EXTBINPREFIX \"\""
+  echo "#define ${package_macro_name}_EXTLIBEXECPREFIX \"$libexecdir/\""
 fi
 echo "#define ${package_macro_name}_LIBEXECPREFIX \"$libexecdir/\""
+echo "#define ${package_macro_name}_SYSCONFPREFIX \"$sysconfdir/\""
 echo "#define ${package_macro_name}_NSSSD_PATH \"$nsssdpath\""
 echo
 echo "#endif"
 exec 1>&3 3>&-
-echo "  ... done."
\ No newline at end of file
+echo "  ... done."
diff --git a/tools/configure.template b/tools/configure.template
index 54e5ea1..51fc2b4 100755
--- a/tools/configure.template
+++ b/tools/configure.template
@@ -405,7 +405,7 @@ tryldflag LDFLAGS_AUTO -Wl,--sort-common
 CPPFLAGS_AUTO="${CPPFLAGS_AUTO}${addincpath}"
 
 if $evenmorestatic ; then
-  LDFLAGS_NOSHARED=-static
+  LDFLAGS_NOSHARED=" -static"
 fi
 
 if $shared ; then
@@ -465,7 +465,7 @@ CFLAGS := ${CFLAGS}${CFLAGS_POST:+ }$CFLAGS_POST
 LDFLAGS_AUTO := $LDFLAGS_AUTO
 LDFLAGS := ${LDFLAGS}${LDFLAGS_POST:+ }$LDFLAGS_POST
 LDFLAGS_SHARED := $LDFLAGS_SHARED
-LDFLAGS_NOSHARED := $LDFLAGS_NOSHARED
+LDFLAGS_NOSHARED :=$LDFLAGS_NOSHARED
 CROSS_COMPILE := $cross
 
 vpath lib%.a$vpaths
diff --git a/tools/gen-configure.el b/tools/gen-configure.el
index 577d86f..eba63fb 100755
--- a/tools/gen-configure.el
+++ b/tools/gen-configure.el
@@ -23,9 +23,9 @@ multisubstitute
 
 if
 {
-  heredoc 0 ${TEMPLATE}
   redirfd -w 1 configure.new
-  s6-cat
+  if { heredoc 0 ${TEMPLATE} s6-cat }
+  s6-echo
 }
 
 if { s6-chmod 0755 configure.new }