From 5fee2f90f3d2bde22239938ee0ec6c381b1ad91f Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 08:48:29 +0100
Subject: Merging upstream version 1.9.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
---
 Makefile.in | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 3062c4e..09b0294 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 
-DISTNAME = $(progname)-$(progversion)
+DISTNAME = $(pkgname)-$(pkgversion)
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL) -p -m 755
 INSTALL_DATA = $(INSTALL) -p -m 644
@@ -25,10 +25,10 @@ lziprecover : arg_parser.o lziprecover.o
 	$(CXX) $(LDFLAGS) -o lziprecover arg_parser.o lziprecover.o
 
 main.o : main.cc
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(progversion)\" -c -o $@ $<
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
 
 lziprecover.o : lziprecover.cc
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(progversion)\" -c -o $@ $<
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -c -o $@ $<
 
 %.o : %.cc
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $<
@@ -42,37 +42,39 @@ lziprecover.o : arg_parser.h lzip.h Makefile
 
 doc : info man
 
-info : $(VPATH)/doc/$(progname).info
+info : $(VPATH)/doc/$(pkgname).info
 
-$(VPATH)/doc/$(progname).info : $(VPATH)/doc/$(progname).texinfo
-	cd $(VPATH)/doc && makeinfo $(progname).texinfo
+$(VPATH)/doc/$(pkgname).info : $(VPATH)/doc/$(pkgname).texinfo
+	cd $(VPATH)/doc && makeinfo $(pkgname).texinfo
 
 man : $(VPATH)/doc/$(progname).1 $(VPATH)/doc/lziprecover.1
 
 $(VPATH)/doc/$(progname).1 : $(progname)
-	help2man -o $(VPATH)/doc/$(progname).1 ./$(progname)
+	help2man -n 'data compressor based on the LZMA algorithm' \
+	  -o $(VPATH)/doc/$(progname).1 ./$(progname)
 
 $(VPATH)/doc/lziprecover.1 : lziprecover
-	help2man -o $(VPATH)/doc/lziprecover.1 --no-info ./lziprecover
+	help2man -n 'recover undamaged members from lzip files' \
+	  -o $(VPATH)/doc/lziprecover.1 --no-info ./lziprecover
 
 Makefile : $(VPATH)/configure $(VPATH)/Makefile.in
 	./config.status
 
-check : all $(VPATH)/testsuite/check.sh
+check : all
 	@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite
 
 install : all install-info install-man
-	if test ! -d $(DESTDIR)$(bindir) ; then $(INSTALL_DIR) $(DESTDIR)$(bindir) ; fi
+	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(INSTALL_DIR) $(DESTDIR)$(bindir) ; fi
 	$(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(progname)
 	$(INSTALL_PROGRAM) ./lziprecover $(DESTDIR)$(bindir)/lziprecover
 
 install-info :
-	if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL_DIR) $(DESTDIR)$(infodir) ; fi
-	$(INSTALL_DATA) $(VPATH)/doc/$(progname).info $(DESTDIR)$(infodir)/$(progname).info
-	-install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(progname).info
+	if [ ! -d $(DESTDIR)$(infodir) ] ; then $(INSTALL_DIR) $(DESTDIR)$(infodir) ; fi
+	$(INSTALL_DATA) $(VPATH)/doc/$(pkgname).info $(DESTDIR)$(infodir)/$(pkgname).info
+	-install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$(pkgname).info
 
 install-man :
-	if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 ; fi
+	if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then $(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 ; fi
 	$(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(progname).1
 	$(INSTALL_DATA) $(VPATH)/doc/lziprecover.1 $(DESTDIR)$(mandir)/man1/lziprecover.1
 
@@ -84,14 +86,14 @@ uninstall : uninstall-info uninstall-man
 	-rm -f $(DESTDIR)$(bindir)/lziprecover
 
 uninstall-info :
-	-install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(progname).info
-	-rm -f $(DESTDIR)$(infodir)/$(progname).info
+	-install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(pkgname).info
+	-rm -f $(DESTDIR)$(infodir)/$(pkgname).info
 
 uninstall-man :
 	-rm -f $(DESTDIR)$(mandir)/man1/$(progname).1
 	-rm -f $(DESTDIR)$(mandir)/man1/lziprecover.1
 
-dist :
+dist : doc
 	ln -sf $(VPATH) $(DISTNAME)
 	tar -cvf $(DISTNAME).tar \
 	  $(DISTNAME)/AUTHORS \
@@ -103,11 +105,12 @@ dist :
 	  $(DISTNAME)/README \
 	  $(DISTNAME)/configure \
 	  $(DISTNAME)/doc/$(progname).1 \
-	  $(DISTNAME)/doc/$(progname).info \
-	  $(DISTNAME)/doc/$(progname).texinfo \
+	  $(DISTNAME)/doc/$(pkgname).info \
+	  $(DISTNAME)/doc/$(pkgname).texinfo \
 	  $(DISTNAME)/doc/lziprecover.1 \
-	  $(DISTNAME)/testsuite/COPYING.lz \
 	  $(DISTNAME)/testsuite/check.sh \
+	  $(DISTNAME)/testsuite/test1 \
+	  $(DISTNAME)/testsuite/test1.lz \
 	  $(DISTNAME)/testsuite/unzcrash.cc \
 	  $(DISTNAME)/*.h \
 	  $(DISTNAME)/*.cc
-- 
cgit v1.2.3