From: hansr <hk-git@circlestorm.org>
Date: Fri, 31 Oct 2014 12:10:48 +0000 (+0100)
Subject: Add "generic" arch dir that is used by default unless the arch has
X-Git-Tag: 1.9.9-b1~897
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c777ee955ef820c71486408d38890ed6db8e5293;p=thirdparty%2Fzlib-ng.git

Add "generic" arch dir that is used by default unless the arch has
specific support in the configure script.
---

diff --git a/arch/generic/Makefile.in b/arch/generic/Makefile.in
new file mode 100644
index 000000000..7eb4127cc
--- /dev/null
+++ b/arch/generic/Makefile.in
@@ -0,0 +1,16 @@
+# Makefile for zlib
+# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler
+# For conditions of distribution and use, see copyright notice in zlib.h
+
+CC=
+CFLAGS=
+SFLAGS=
+
+all:
+
+
+mostlyclean: clean
+clean:
+	rm -f *.o *.lo *~ \
+	rm -rf objs
+	rm -f *.gcda *.gcno *.gcov
diff --git a/configure b/configure
index 6fa26b5de..8cbdeb697 100755
--- a/configure
+++ b/configure
@@ -640,7 +640,7 @@ if test $without_new_strategies -eq 0; then
     SFLAGS="${SFLAGS} -DMEDIUM_STRATEGY"
 fi
 
-ARCHDIR=''
+ARCHDIR='arch/generic'
 ARCH_STATIC_OBJS=''
 ARCH_SHARED_OBJS=''
 
@@ -767,15 +767,12 @@ sed < Makefile.in "
 /^ARCH_SHARED_OBJS *=/s#=.*#=$ARCH_SHARED_OBJS#
 " > 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
+# Generate Makefile in arch dir
+sed < $ARCHDIR/Makefile.in "
+/^CC *=/s#=.*#=$CC#
+/^CFLAGS *=/s#=.*#=$CFLAGS#
+/^SFLAGS *=/s#=.*#=$SFLAGS#
+" > $ARCHDIR/Makefile
 
 # create zlib.pc with the configure results
 sed < zlib.pc.in "