CMake build fixes

[zlib.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index c8b487c287bb945048eb7b11343787b035ff966b..3d858aa3a246df67df6ec6c386f7d45b2c63fda8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for zlib
-# Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
+# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
 # For conditions of distribution and use, see copyright notice in zlib.h
 
 # To compile and test, type:
@@ -32,7 +32,7 @@ CPP=$(CC) -E
 
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.9
+SHAREDLIBV=libz.so.1.2.12
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIBV)
 
@@ -91,8 +91,8 @@ teststatic: static
          echo '                *** zlib test OK ***'; \
        else \
          echo '                *** zlib test FAILED ***'; false; \
-       fi; \
-       rm -f $$TMPST
+       fi
+       @rm -f tmpst_$$
 
 testshared: shared
        @LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
@@ -104,8 +104,8 @@ testshared: shared
          echo '                *** zlib shared test OK ***'; \
        else \
          echo '                *** zlib shared test FAILED ***'; false; \
-       fi; \
-       rm -f $$TMPSH
+       fi
+       @rm -f tmpsh_$$
 
 test64: all64
        @TMP64=tmp64_$$; \
@@ -113,8 +113,8 @@ test64: all64
          echo '                *** zlib 64-bit test OK ***'; \
        else \
          echo '                *** zlib 64-bit test FAILED ***'; false; \
-       fi; \
-       rm -f $$TMP64
+       fi
+       @rm -f tmp64_$$
 
 infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h
        $(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/infcover.c
@@ -309,10 +309,12 @@ install-libs: $(LIBS)
        -@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
        -@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
        -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+       rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
        cp $(STATICLIB) $(DESTDIR)$(libdir)
        chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
        -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
        -@if test -n "$(SHAREDLIBV)"; then \
+         rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
          cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
          echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
          chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
@@ -322,8 +324,10 @@ install-libs: $(LIBS)
          ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
          ($(LDCONFIG) || true)  >/dev/null 2>&1; \
        fi
+       rm -f $(DESTDIR)$(man3dir)/zlib.3
        cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
        chmod 644 $(DESTDIR)$(man3dir)/zlib.3
+       rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc
        cp zlib.pc $(DESTDIR)$(pkgconfigdir)
        chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
 # The ranlib in install is needed on NeXTSTEP which checks file times
@@ -331,6 +335,7 @@ install-libs: $(LIBS)
 
 install: install-libs
        -@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
+       rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
        cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
        chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
 
@@ -371,15 +376,13 @@ clean:
        rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
 
 maintainer-clean: distclean
-distclean: clean zconf zconf.h.cmakein docs
+distclean: clean zconf zconf.h.cmakein
        rm -f Makefile zlib.pc configure.log
        -@rm -f .DS_Store
        @if [ -f Makefile.in ]; then \
        printf 'all:\n\t-@echo "Please use ./configure first.  Thank you."\n' > Makefile ; \
        printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile ; \
        touch -r $(SRCDIR)Makefile.in Makefile ; fi
-       @if [ ! -f zconf.h.in ]; then rm -f zconf.h zconf.h.cmakein ; fi
-       @if [ ! -f zlib.3 ]; then rm -f zlib.3.pdf ; fi
 
 tags:
        etags $(SRCDIR)*.[ch]