diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-21 20:57:35 +0200 |
| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 (patch) | |
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 /package/zlib/patches/patch-Makefile_in | |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 (diff) | |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/zlib/patches/patch-Makefile_in')
| -rw-r--r-- | package/zlib/patches/patch-Makefile_in | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/package/zlib/patches/patch-Makefile_in b/package/zlib/patches/patch-Makefile_in deleted file mode 100644 index c34514a03..000000000 --- a/package/zlib/patches/patch-Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- zlib-1.2.3.orig/Makefile.in 2005-07-18 04:25:21.000000000 +0200 -+++ zlib-1.2.3/Makefile.in 2008-12-31 16:32:48.417074167 +0100 -@@ -34,6 +34,7 @@ SHAREDLIBV=libz.so.1.2.3 - SHAREDLIBM=libz.so.1 - - AR=ar rc -+ARFLAGS=rc - RANLIB=ranlib - TAR=tar - SHELL=/bin/sh -@@ -68,7 +69,7 @@ test: all - fi - - libz.a: $(OBJS) $(OBJA) -- $(AR) $@ $(OBJS) $(OBJA) -+ $(AR) $(ARFLAGS) $@ $(OBJS) $(OBJA) - -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 - - match.o: match.S |