Separate zlib install target

diff --git a/lib/Makefile b/lib/Makefile
index 6b9e17d2e47a31111c533a78a9fe0134df8aa9bc..5974401c5f4334692df675ce4a7bb6690aebcb66 100755 (executable)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,6 +1,7 @@
 
 ACKBASE=$(CURDIR)/obj-ack
 GNUBASE=$(CURDIR)/obj-gnu
+ZLIB=zlib-1.2.3
 
 OBJDIR=.
 
@@ -23,14 +24,16 @@ SUBDIRS = ansi \
        sysutil \
        timers \
        i386 \
-       zlib-1.2.3 \
+       $(ZLIB) \
        ack \
        gnu
        
 
 include Makefile.inc
 
+install::
+       cd $(ZLIB) && $(MAKE) ACKBASE=$(ACKBASE) GNUBASE=$(GNUBASE) install
+
 install:: all
        install -o bin $(ACKBASE)/*.[ao] /usr/lib/i386
-       install -o bin $(ACKBASE)/*.[ao] /usr/local/lib
        install -o bin $(GNUBASE)/*.[ao] /usr/gnu/lib

diff --git a/lib/zlib-1.2.3/Makefile b/lib/zlib-1.2.3/Makefile
index 04ce64b207078770a180681485cce76a5e765018..06324a07c7d60a3a358b64d671d75d40ace1ce9c 100644 (file)
--- a/lib/zlib-1.2.3/Makefile
+++ b/lib/zlib-1.2.3/Makefile
@@ -28,7 +28,7 @@ CFLAGS=-D_MINIX=1 -D_POSIX_SOURCE=1
 #LDSHARED=cc
 #CPP=cc -E
 
-#LIBS=libz.a
+LIBS=$(ACKBASE)/libz.a
 LIBRARIES=libz
 #SHAREDLIB=libz.so
 #SHAREDLIBV=libz.so.1.2.2
@@ -40,12 +40,12 @@ LIBRARIES=libz
 #SHELL=/bin/sh
 #EXE=
 
-#prefix =/usr/local
-#exec_prefix =${prefix}
-#libdir =${exec_prefix}/lib
-#includedir =${prefix}/include
-#mandir =/usr/local/man
-#man3dir = ${mandir}/man3
+prefix =/usr/local
+exec_prefix =${prefix}
+libdir =${exec_prefix}/lib
+includedir =${prefix}/include
+mandir =/usr/local/man
+man3dir = ${mandir}/man3
 
 #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
@@ -95,24 +95,24 @@ libz_OBJECTS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
 #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
-#      install -o bin zlib.h zconf.h $(includedir)
-#      chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
-#      install -o bin $(LIBS) $(libdir)
-#      cd $(libdir); chmod 755 $(LIBS)
-#      -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-#      cd $(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
-#      install -o bin zlib.3 $(man3dir)
-#      chmod 644 $(man3dir)/zlib.3
+install::
+       -@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
+       install -o bin zlib.h zconf.h $(includedir)
+       chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
+       install -o bin $(LIBS) $(libdir)
+       cd $(libdir); chmod 755 $(LIBS)
+       -@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+       cd $(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
+       install -o bin zlib.3 $(man3dir)
+       chmod 644 $(man3dir)/zlib.3
 # The ranlib in install is needed on NeXTSTEP which checks file times
 # ldconfig is for Linux