From 1f98801df36334e9e0d80e3db19247a5c65c9bf4 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 08:47:56 +0100
Subject: Adding upstream version 1.8.

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

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index decce04..3062c4e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,8 +2,8 @@
 DISTNAME = $(progname)-$(progversion)
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL) -p -m 755
-INSTALL_SCRIPT = $(INSTALL) -p -m 755
 INSTALL_DATA = $(INSTALL) -p -m 644
+INSTALL_DIR = $(INSTALL) -d -m 755
 SHELL = /bin/sh
 
 objs = arg_parser.o decoder.o encoder.o main.o
@@ -47,14 +47,7 @@ info : $(VPATH)/doc/$(progname).info
 $(VPATH)/doc/$(progname).info : $(VPATH)/doc/$(progname).texinfo
 	cd $(VPATH)/doc && makeinfo $(progname).texinfo
 
-man : $(VPATH)/doc/lzdiff.1 $(VPATH)/doc/lzgrep.1 \
-      $(VPATH)/doc/$(progname).1 $(VPATH)/doc/lziprecover.1
-
-$(VPATH)/doc/lzdiff.1 : $(VPATH)/lzdiff
-	help2man -o $(VPATH)/doc/lzdiff.1 --no-info $(VPATH)/lzdiff
-
-$(VPATH)/doc/lzgrep.1 : $(VPATH)/lzgrep
-	help2man -o $(VPATH)/doc/lzgrep.1 --no-info $(VPATH)/lzgrep
+man : $(VPATH)/doc/$(progname).1 $(VPATH)/doc/lziprecover.1
 
 $(VPATH)/doc/$(progname).1 : $(progname)
 	help2man -o $(VPATH)/doc/$(progname).1 ./$(progname)
@@ -69,21 +62,17 @@ check : all $(VPATH)/testsuite/check.sh
 	@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite
 
 install : all install-info install-man
-	if test ! -d $(DESTDIR)$(bindir) ; then $(INSTALL) -d $(DESTDIR)$(bindir) ; fi
-	$(INSTALL_SCRIPT) $(VPATH)/lzdiff $(DESTDIR)$(bindir)/lzdiff
-	$(INSTALL_SCRIPT) $(VPATH)/lzgrep $(DESTDIR)$(bindir)/lzgrep
+	if test ! -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) -d $(DESTDIR)$(infodir) ; fi
+	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
 
 install-man :
-	if test ! -d $(DESTDIR)$(mandir)/man1 ; then $(INSTALL) -d $(DESTDIR)$(mandir)/man1 ; fi
-	$(INSTALL_DATA) $(VPATH)/doc/lzdiff.1 $(DESTDIR)$(mandir)/man1/lzdiff.1
-	$(INSTALL_DATA) $(VPATH)/doc/lzgrep.1 $(DESTDIR)$(mandir)/man1/lzgrep.1
+	if test ! -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
 
@@ -91,8 +80,6 @@ install-strip : all
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
 uninstall : uninstall-info uninstall-man
-	-rm -f $(DESTDIR)$(bindir)/lzdiff
-	-rm -f $(DESTDIR)$(bindir)/lzgrep
 	-rm -f $(DESTDIR)$(bindir)/$(progname)
 	-rm -f $(DESTDIR)$(bindir)/lziprecover
 
@@ -102,6 +89,7 @@ uninstall-info :
 
 uninstall-man :
 	-rm -f $(DESTDIR)$(mandir)/man1/$(progname).1
+	-rm -f $(DESTDIR)$(mandir)/man1/lziprecover.1
 
 dist :
 	ln -sf $(VPATH) $(DISTNAME)
@@ -114,14 +102,10 @@ dist :
 	  $(DISTNAME)/NEWS \
 	  $(DISTNAME)/README \
 	  $(DISTNAME)/configure \
-	  $(DISTNAME)/doc/lzdiff.1 \
-	  $(DISTNAME)/doc/lzgrep.1 \
 	  $(DISTNAME)/doc/$(progname).1 \
 	  $(DISTNAME)/doc/$(progname).info \
 	  $(DISTNAME)/doc/$(progname).texinfo \
 	  $(DISTNAME)/doc/lziprecover.1 \
-	  $(DISTNAME)/lzdiff \
-	  $(DISTNAME)/lzgrep \
 	  $(DISTNAME)/testsuite/COPYING.lz \
 	  $(DISTNAME)/testsuite/check.sh \
 	  $(DISTNAME)/testsuite/unzcrash.cc \
-- 
cgit v1.2.3