From b003d868664314a7c6de6e981c256d89ac9d87f3 Mon Sep 17 00:00:00 2001
From: PktSurf <smlinux@pktsurf.in>
Date: Fri, 17 Mar 2023 13:24:09 +0530
Subject: [PATCH] Minor fixes to CC variable and other build options in
 base/{signify,swig,sysklogd}

---
 base/signify/signify.SMBuild   | 18 ++++++++++--------
 base/swig/swig.SMBuild         |  3 +--
 base/sysklogd/sysklogd.SMBuild |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/base/signify/signify.SMBuild b/base/signify/signify.SMBuild
index d572596..0c51592 100755
--- a/base/signify/signify.SMBuild
+++ b/base/signify/signify.SMBuild
@@ -21,19 +21,21 @@ build() {
   # in by xorg and qt5-based applications. We'll keep it contained to the 
   # signify source directory by modifying the pkgconfig path and CFLAGS and LDFLAGS.
 
-  mkdir libbsd && cd libbsd
-  tar xf "$srcdir"/libbsd-$libbsdversion.tar.?z
-  cd libbsd-$libbsdversion
-  ./configure --prefix="$PWD"/../
-  make && make install
-  cd ..
+  mkdir -p libbsd && cd libbsd
+
+  (
+    tar xf "$srcdir"/libbsd-$libbsdversion.tar.?z
+    cd libbsd-$libbsdversion
+    ./configure --prefix="$PWD"/../
+    make && make install
+  )
 
   LIBBSDPATH="$PWD"
   cd ..
 
-  PKG_CONFIG_PATH="$pkg_CONFIG_PATH:$LIBBSDPATH/lib/pkgconfig"
+  PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$LIBBSDPATH/lib/pkgconfig"
   applypatch $srcdir/sha2.h.patch
-  make CC="$CC -static" \
+  make CC+=" -static" \
    CFLAGS="-I$LIBBSDPATH/include" LDFLAGS="-L$LIBBSDPATH/lib"
   make install PREFIX="" DESTDIR=$pkg
 
diff --git a/base/swig/swig.SMBuild b/base/swig/swig.SMBuild
index 48cbd94..0cdc2d5 100755
--- a/base/swig/swig.SMBuild
+++ b/base/swig/swig.SMBuild
@@ -17,8 +17,7 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
-    --sysconfdir=/etc 
+    --prefix=""
 
   make
   make install DESTDIR=$pkg 
diff --git a/base/sysklogd/sysklogd.SMBuild b/base/sysklogd/sysklogd.SMBuild
index fe5d64d..8fca195 100755
--- a/base/sysklogd/sysklogd.SMBuild
+++ b/base/sysklogd/sysklogd.SMBuild
@@ -20,7 +20,7 @@ prepbuilddir() {
 }
 
 build() {
-  make all syslog_tst CC="$CC -static"
+  make all syslog_tst CC+=" -static"
 
   # install binaries
   install -Dm 755 klogd $pkg/bin/klogd
@@ -36,7 +36,7 @@ build() {
   install -Dm 644 $srcdir/syslog.conf.new $pkg/etc/syslog.conf.new
   install -Dm 644 $srcdir/syslog.logrotate $pkg/etc/logrotate.d/syslog.new
 
-  cp ANNOUNCE CHANGES COPYING MANIFEST NEWS README* $pkgdocs/
+  cp COPYING $pkgdocs/
 
   mkdir -p $pkg/var/log
   for i in cron debug maillog messages secure spooler syslog ; do