1 files changed, 24 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 2fd6e45..460471b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for zlib
-# Copyright (C) 1995-2005 Jean-loup Gailly.
+# Copyright (C) 1995-2006 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h
 
 # To compile and test, type:
@@ -30,10 +30,10 @@ CPP=$(CC) -E
 
 LIBS=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.3
+SHAREDLIBV=libz.so.1.2.3.1
 SHAREDLIBM=libz.so.1
 
-AR=ar rc
+AR=ar
 RANLIB=ranlib
 TAR=tar
 SHELL=/bin/sh
@@ -45,6 +45,7 @@ libdir = ${exec_prefix}/lib
 includedir = ${prefix}/include
 mandir = ${prefix}/share/man
 man3dir = ${mandir}/man3
+pkgconfigdir = ${libdir}/pkgconfig
 
 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
        zutil.o inflate.o infback.o inftrees.o inffast.o
@@ -90,33 +91,37 @@ minigzip$(EXE): minigzip.o $(LIBS)
         $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 
 install: $(LIBS)
-        -@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
-        -@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
-        -@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
-        -@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
-        cp zlib.h zconf.h $(includedir)
-        chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
-        cp $(LIBS) $(libdir)
-        cd $(libdir); chmod 755 $(LIBS)
-        -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-        cd $(libdir); if test -f $(SHAREDLIBV); then \
+        -@if [ ! -d $(DESTDIR)$(exec_prefix)  ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
+        -@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
+        -@if [ ! -d $(DESTDIR)$(libdir)       ]; then mkdir -p $(DESTDIR)$(libdir); fi
+        -@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
+        -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+        cp zlib.h zconf.h $(DESTDIR)$(includedir)
+        chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
+        cp $(LIBS) $(DESTDIR)$(libdir)
+        cd $(DESTDIR)$(libdir); chmod 755 $(LIBS)
+        -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+        cd $(DESTDIR)$(libdir); if test -f $(SHAREDLIBV); then \
           rm -f $(SHAREDLIB) $(SHAREDLIBM); \
           ln -s $(SHAREDLIBV) $(SHAREDLIB); \
           ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
           (ldconfig || true)  >/dev/null 2>&1; \
         fi
-        cp zlib.3 $(man3dir)
-        chmod 644 $(man3dir)/zlib.3
+        cp zlib.3 $(DESTDIR)$(man3dir)
+        chmod 644 $(DESTDIR)$(man3dir)/zlib.3
+        cp zlib.pc $(DESTDIR)$(pkgconfigdir)
+        chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
 # The ranlib in install is needed on NeXTSTEP which checks file times
 # ldconfig is for Linux
 
 uninstall:
-        cd $(includedir); \
-        cd $(libdir); rm -f libz.a; \
+        cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h
+        cd $(DESTDIR)$(libdir); rm -f libz.a; \
         if test -f $(SHAREDLIBV); then \
           rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
         fi
-        cd $(man3dir); rm -f zlib.3
+        cd $(DESTDIR)$(man3dir); rm -f zlib.3
+        cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc
 
 mostlyclean: clean
 clean:
@@ -128,7 +133,7 @@ maintainer-clean: distclean
 distclean: clean
         cp -p Makefile.in Makefile
         cp -p zconf.in.h zconf.h
-        rm -f .DS_Store
+        rm -f zlib.pc .DS_Store
 
 tags:
         etags *.[ch]