diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 14:03:18 +0000 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-11-07 14:03:18 +0000 |
| commit | c845b66d8b17513b64acac9e74d20631a68e22b1 (patch) | |
| tree | 21d33ec195507dbd025d6743a375db317f4e7f49 /Makefile.in | |
| parent | Adding debian version 1.6~pre2-2. (diff) | |
| download | lzlib-c845b66d8b17513b64acac9e74d20631a68e22b1.tar.xz lzlib-c845b66d8b17513b64acac9e74d20631a68e22b1.zip | |
Merging upstream version 1.6~pre3.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index ebdef06..6f69b0a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -15,7 +15,7 @@ objs = carg_parser.o main.o install-as-lzip uninstall uninstall-bin uninstall-info uninstall-man \ doc info man check dist clean distclean -all : $(progname) $(progname_shared) +all : $(progname_static) $(progname_shared) lib$(libname).a : lzlib.o $(AR) -rcs $@ $< @@ -73,7 +73,7 @@ $(VPATH)/doc/$(progname).1 : $(progname) Makefile : $(VPATH)/configure $(VPATH)/Makefile.in ./config.status -check : all bbexample lzcheck +check : $(progname) bbexample lzcheck @$(VPATH)/testsuite/check.sh $(VPATH)/testsuite $(pkgversion) install : install-bin install-info @@ -82,17 +82,17 @@ install-bin : all if [ ! -d "$(DESTDIR)$(includedir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(includedir)" ; fi if [ ! -d "$(DESTDIR)$(libdir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(libdir)" ; fi $(INSTALL_DATA) $(VPATH)/$(libname)lib.h "$(DESTDIR)$(includedir)/$(libname)lib.h" - $(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a" + if [ -n "$(progname_static)" ] ; then \ + $(INSTALL_DATA) ./lib$(libname).a "$(DESTDIR)$(libdir)/lib$(libname).a" ; \ + fi if [ -n "$(progname_shared)" ] ; then \ $(INSTALL_PROGRAM) ./lib$(libname).so.$(pkgversion) "$(DESTDIR)$(libdir)/lib$(libname).so.$(pkgversion)" ; \ if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ] ; then \ - rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \ run_ldconfig=no ; \ else run_ldconfig=yes ; \ fi ; \ - if [ -e "$(DESTDIR)$(libdir)/lib$(libname).so" ] ; then \ - rm -f "$(DESTDIR)$(libdir)/lib$(libname).so" ; \ - fi ; \ + rm -f "$(DESTDIR)$(libdir)/lib$(libname).so" ; \ + rm -f "$(DESTDIR)$(libdir)/lib$(libname).so.$(soversion)" ; \ cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so ; \ cd "$(DESTDIR)$(libdir)" && ln -s lib$(libname).so.$(pkgversion) lib$(libname).so.$(soversion) ; \ if [ "${disable_ldconfig}" != yes ] && [ $${run_ldconfig} = yes ] && \ @@ -113,7 +113,7 @@ install-strip : all install-as-lzip : install install-man if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi - $(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(progname)" + $(INSTALL_PROGRAM) ./$(progname_lzip) "$(DESTDIR)$(bindir)/$(progname)" -rm -f "$(DESTDIR)$(bindir)/lzip" cd "$(DESTDIR)$(bindir)" && ln -s $(progname) lzip |