| 1 |
--- zlib-1.2.6/configure.multibuild~ 2012-01-29 18:48:11.000000000 +0100 |
| 2 |
+++ zlib-1.2.6/configure 2012-01-30 16:52:17.379118075 +0100 |
| 3 |
@@ -22,11 +22,12 @@ if [ -n "${CHOST}" ]; then |
| 4 |
CROSS_PREFIX="${CHOST}-" |
| 5 |
fi |
| 6 |
|
| 7 |
+top_srcdir="`dirname $0`" |
| 8 |
STATICLIB=libz.a |
| 9 |
-VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h` |
| 10 |
-VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h` |
| 11 |
-VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h` |
| 12 |
-VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h` |
| 13 |
+VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < "$top_srcdir/zlib.h"` |
| 14 |
+VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < "$top_srcdir/zlib.h"` |
| 15 |
+VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < "$top_srcdir/zlib.h"` |
| 16 |
+VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < "$top_srcdir/zlib.h"` |
| 17 |
if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then |
| 18 |
AR=${AR-"${CROSS_PREFIX}ar"} |
| 19 |
test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log |
| 20 |
@@ -173,9 +174,9 @@ if test "$gcc" -eq 1 && ($cc -c $cflags |
| 21 |
fi |
| 22 |
case "$uname" in |
| 23 |
Linux* | linux* | GNU | GNU/* | solaris*) |
| 24 |
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;; |
| 25 |
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,$top_srcdir/zlib.map"} ;; |
| 26 |
*BSD | *bsd* | DragonFly) |
| 27 |
- LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} |
| 28 |
+ LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,$top_srcdir/zlib.map"} |
| 29 |
LDCONFIG="ldconfig -m" ;; |
| 30 |
CYGWIN* | Cygwin* | cygwin* | OS/2*) |
| 31 |
EXE='.exe' ;; |
| 32 |
@@ -367,7 +368,7 @@ EOF |
| 33 |
fi |
| 34 |
fi |
| 35 |
|
| 36 |
-cp -p zconf.h.in zconf.h |
| 37 |
+cp -p "$top_srcdir"/zconf.h.in zconf.h |
| 38 |
|
| 39 |
echo >> configure.log |
| 40 |
|
| 41 |
@@ -666,7 +667,7 @@ echo >> configure.log |
| 42 |
echo >> configure.log |
| 43 |
|
| 44 |
# udpate Makefile |
| 45 |
-sed < Makefile.in " |
| 46 |
+sed < "$top_srcdir"/Makefile.in " |
| 47 |
/^CC *=/s#=.*#=$CC# |
| 48 |
/^CFLAGS *=/s#=.*#=$CFLAGS# |
| 49 |
/^SFLAGS *=/s#=.*#=$SFLAGS# |
| 50 |
@@ -695,7 +696,7 @@ sed < Makefile.in " |
| 51 |
/^test: */s#:.*#: $TEST# |
| 52 |
" > Makefile |
| 53 |
|
| 54 |
-sed < zlib.pc.in " |
| 55 |
+sed < $top_srcdir/zlib.pc.in " |
| 56 |
/^CC *=/s#=.*#=$CC# |
| 57 |
/^CFLAGS *=/s#=.*#=$CFLAGS# |
| 58 |
/^CPP *=/s#=.*#=$CPP# |
| 59 |
@@ -718,3 +719,14 @@ sed < zlib.pc.in " |
| 60 |
" | sed -e " |
| 61 |
s/\@VERSION\@/$VER/g; |
| 62 |
" > zlib.pc |
| 63 |
+ |
| 64 |
+# symlink sources |
| 65 |
+if test "$top_srcdir" != "."; then |
| 66 |
+ for f in $top_srcdir/*.[ch]; do |
| 67 |
+ ln -s $f `basename $f` |
| 68 |
+ done |
| 69 |
+ mkdir test |
| 70 |
+ for f in `readlink -f $top_srcdir`/test/*.[ch]; do |
| 71 |
+ ln -s $f test/`basename $f` |
| 72 |
+ done |
| 73 |
+fi |
| 74 |
--- zlib-1.2.6/Makefile.in.multibuild~ 2012-01-28 23:48:50.000000000 +0100 |
| 75 |
+++ zlib-1.2.6/Makefile.in 2012-01-30 16:51:25.652118992 +0100 |
| 76 |
@@ -182,12 +182,10 @@ example64$(EXE): example64.o $(STATICLIB |
| 77 |
minigzip64$(EXE): minigzip64.o $(STATICLIB) |
| 78 |
$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) |
| 79 |
|
| 80 |
-install-libs: $(LIBS) |
| 81 |
+install-libs-only: $(LIBS) |
| 82 |
-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi |
| 83 |
-@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi |
| 84 |
-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi |
| 85 |
- -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi |
| 86 |
- -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi |
| 87 |
cp $(STATICLIB) $(DESTDIR)$(libdir) |
| 88 |
chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB) |
| 89 |
-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1 |
| 90 |
@@ -201,6 +199,10 @@ install-libs: $(LIBS) |
| 91 |
ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ |
| 92 |
($(LDCONFIG) || true) >/dev/null 2>&1; \ |
| 93 |
fi |
| 94 |
+ |
| 95 |
+install-libs: install-libs-only |
| 96 |
+ -@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi |
| 97 |
+ -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi |
| 98 |
cp zlib.3 $(DESTDIR)$(man3dir) |
| 99 |
chmod 644 $(DESTDIR)$(man3dir)/zlib.3 |
| 100 |
cp zlib.pc $(DESTDIR)$(pkgconfigdir) |
Parent Directory
| 
Revision Log