| diff -aruN a/zlib-1.2.6/Makefile.in b/zlib-1.2.6/Makefile.in |
| --- a/zlib-1.2.6/Makefile.in 2014-06-10 12:01:33.545047312 -0700 |
| +++ b/zlib-1.2.6/Makefile.in 2014-06-10 14:33:50.674540434 -0700 |
| @@ -17,7 +17,6 @@ |
| # make install prefix=$HOME |
| |
| CC=cc |
| - |
| CFLAGS=-O |
| #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 |
| #CFLAGS=-g -DDEBUG |
| @@ -44,6 +43,7 @@ |
| TAR=tar |
| SHELL=/bin/sh |
| EXE= |
| +INSTALL=/usr/bin/install -c -C |
| |
| builddir = . |
| srcdir = . |
| @@ -187,35 +187,28 @@ |
| $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS) |
| |
| install-libs: $(LIBS) |
| - -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi |
| - -@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi |
| - -@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 |
| - cp $(STATICLIB) $(DESTDIR)$(libdir) |
| - chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB) |
| + @$(INSTALL) -d $(DESTDIR)$(exec_prefix) |
| + @$(INSTALL) -d $(DESTDIR)$(libdir) |
| + @$(INSTALL) -d $(DESTDIR)$(sharedlibdir) |
| + @$(INSTALL) -d $(DESTDIR)$(man3dir) |
| + @$(INSTALL) -d $(DESTDIR)$(pkgconfigdir) |
| + @$(INSTALL) -m 644 $(STATICLIB) $(DESTDIR)$(libdir) |
| -@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1 |
| -@if test -n "$(SHAREDLIBV)"; then \ |
| - cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ |
| - echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ |
| - chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \ |
| - echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \ |
| - rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ |
| - ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \ |
| - ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ |
| + $(INSTALL) -m 755 $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \ |
| + echo "$(INSTALL) -m 755 $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \ |
| + ln -sf $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \ |
| + ln -sf $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \ |
| ($(LDCONFIG) || true) >/dev/null 2>&1; \ |
| fi |
| - cp $(srcdir)/zlib.3 $(DESTDIR)$(man3dir) |
| - chmod 644 $(DESTDIR)$(man3dir)/zlib.3 |
| - cp zlib.pc $(DESTDIR)$(pkgconfigdir) |
| - chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc |
| + @$(INSTALL) -m 644 $(srcdir)/zlib.3 $(DESTDIR)$(man3dir) |
| + @$(INSTALL) -m 644 zlib.pc $(DESTDIR)$(pkgconfigdir) |
| # The ranlib in install is needed on NeXTSTEP which checks file times |
| # ldconfig is for Linux |
| |
| install: install-libs |
| - -@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi |
| - cp $(srcdir)/zlib.h zconf.h $(DESTDIR)$(includedir) |
| - chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h |
| + $(INSTALL) -d $(DESTDIR)$(includedir) |
| + $(INSTALL) -m 644 $(srcdir)/zlib.h zconf.h $(DESTDIR)$(includedir) |
| |
| uninstall: |
| cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h |