zlib 1.2.4.4

[zlib.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a79f73939a86570537beddd3190da95c2dd0e6ae..f932d9f0ad681f6513089cecc68a75f643da57df 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,13 +26,13 @@ CFLAGS=-O
 
 SFLAGS=-O
 
-LDFLAGS=-L. libz.a
+TEST_LDFLAGS=-L. libz.a
 LDSHARED=$(CC)
 CPP=$(CC) -E
 
 STATICLIB=libz.a
 SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.4.1
+SHAREDLIBV=libz.so.1.2.4.4
 SHAREDLIBM=libz.so.1
 LIBS=$(STATICLIB) $(SHAREDLIBV)
 
@@ -47,6 +47,7 @@ EXE=
 prefix = /usr/local
 exec_prefix = ${prefix}
 libdir = ${exec_prefix}/lib
+sharedlibdir = ${libdir}
 includedir = ${prefix}/include
 mandir = ${prefix}/share/man
 man3dir = ${mandir}/man3
@@ -136,17 +137,17 @@ minigzip64.o: minigzip.c zlib.h zconf.h
        -@mv objs/$*.o $@
 
 $(SHAREDLIBV): $(PIC_OBJS)
-       $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC)
+       $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
        rm -f $(SHAREDLIB) $(SHAREDLIBM)
        ln -s $@ $(SHAREDLIB)
        ln -s $@ $(SHAREDLIBM)
        -@rmdir objs
 
 example$(EXE): example.o $(STATICLIB)
-       $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
+       $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
 
 minigzip$(EXE): minigzip.o $(STATICLIB)
-       $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+       $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
 
 examplesh$(EXE): example.o $(SHAREDLIBV)
        $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV)
@@ -155,20 +156,22 @@ minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
        $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV)
 
 example64$(EXE): example64.o $(STATICLIB)
-       $(CC) $(CFLAGS) -o $@ example64.o $(LDFLAGS)
+       $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
 
 minigzip64$(EXE): minigzip64.o $(STATICLIB)
-       $(CC) $(CFLAGS) -o $@ minigzip64.o $(LDFLAGS)
+       $(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 $(LIBS) $(DESTDIR)$(libdir)
+       cp $(STATICLIB) $(DESTDIR)$(libdir)
+       cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
        cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
        -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-       -@cd $(DESTDIR)$(libdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
+       -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
          chmod 755 $(SHAREDLIBV); \
          rm -f $(SHAREDLIB) $(SHAREDLIBM); \
          ln -s $(SHAREDLIBV) $(SHAREDLIB); \