From 9fb1577fa68b35e663304b90c0bfb39eab2c3b09 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 29 Apr 2025 01:16:47 +0000
Subject:  More fixes

Signed-off-by: Laurent Bercot <ska@appnovation.com>
---
 configure                                               | 6 +++---
 package/configure-snippets/configure_slashpackage_other | 2 +-
 tools/configure.template                                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 02507cf..054e6a2 100755
--- a/configure
+++ b/configure
@@ -318,7 +318,7 @@ if $slashpackage ; then
   libexecdir=$bindir
   includedir=${home}/include
   pkgconfdir=${home}/pkgconfig
-
+  skeldir=${home}/etc/skel
 fi
 
 # Get usable temp filenames
@@ -420,7 +420,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
@@ -507,7 +507,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/package/configure-snippets/configure_slashpackage_other b/package/configure-snippets/configure_slashpackage_other
index 8b13789..dabc307 100644
--- a/package/configure-snippets/configure_slashpackage_other
+++ b/package/configure-snippets/configure_slashpackage_other
@@ -1 +1 @@
-
+  skeldir=${home}/etc/skel
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
-- 
cgit v1.3.1