From: hansr <hk-git@circlestorm.org>
Date: Fri, 31 Oct 2014 11:54:31 +0000 (+0100)
Subject: Fix building for arches that dont set archdir in Configure
X-Git-Tag: 1.9.9-b1~900
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=017c1e22a45ba42cca593572d769377b1ab6420d;p=thirdparty%2Fzlib-ng.git

Fix building for arches that dont set archdir in Configure
---

diff --git a/configure b/configure
index 718676e3d..1a8ca4808 100755
--- a/configure
+++ b/configure
@@ -640,9 +640,9 @@ if test $without_new_strategies -eq 0; then
     SFLAGS="${SFLAGS} -DMEDIUM_STRATEGY"
 fi
 
-ARCHDIR=""
-ARCH_STATIC_OBJS=""
-ARCH_SHARED_OBJS=""
+ARCHDIR=''
+ARCH_STATIC_OBJS=''
+ARCH_SHARED_OBJS=''
 
 # Set ARCH specific FLAGS
 case "${ARCH}" in
@@ -767,11 +767,15 @@ sed < Makefile.in "
 /^ARCH_SHARED_OBJS *=/s#=.*#=$ARCH_SHARED_OBJS#
 " > Makefile
 
-sed < $ARCHDIR/Makefile.in "
-/^CC *=/s#=.*#=$CC#
-/^CFLAGS *=/s#=.*#=$CFLAGS#
-/^SFLAGS *=/s#=.*#=$SFLAGS#
-" > $ARCHDIR/Makefile
+# Generate Makefile in arch dir if needed
+if [ -n $ARCHDIR ]
+then
+    sed < $ARCHDIR/Makefile.in "
+    /^CC *=/s#=.*#=$CC#
+    /^CFLAGS *=/s#=.*#=$CFLAGS#
+    /^SFLAGS *=/s#=.*#=$SFLAGS#
+    " > $ARCHDIR/Makefile
+fi
 
 # create zlib.pc with the configure results
 sed < zlib.pc.in "