]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
Fix building for arches that dont set archdir in Configure
authorhansr <hk-git@circlestorm.org>
Fri, 31 Oct 2014 11:54:31 +0000 (12:54 +0100)
committerhansr <hk-git@circlestorm.org>
Fri, 31 Oct 2014 11:54:31 +0000 (12:54 +0100)
configure

index 718676e3d5b18f22310f5020c4a25331387ab168..1a8ca4808dff0c96139e648fbfbba9cb27ba5ec6 100755 (executable)
--- 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 "