From 54ec5ca53eb5d88daf91b3a6fafdbea43d764fa7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 7 Nov 2015 08:24:30 +0100
Subject: Merging upstream version 1.6.

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

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 1b9d4fb..decce04 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,8 +9,8 @@ SHELL = /bin/sh
 objs = arg_parser.o decoder.o encoder.o main.o
 
 
-.PHONY : all install install-info install-man install-extra install-strip \
-         uninstall uninstall-info uninstall-man uninstall-extra \
+.PHONY : all install install-info install-man install-strip \
+         uninstall uninstall-info uninstall-man \
          doc info man check dist clean distclean
 
 all : $(progname) lziprecover
@@ -47,14 +47,8 @@ info : $(VPATH)/doc/$(progname).info
 $(VPATH)/doc/$(progname).info : $(VPATH)/doc/$(progname).texinfo
 	cd $(VPATH)/doc && makeinfo $(progname).texinfo
 
-man : $(VPATH)/doc/$(progname).1 $(VPATH)/doc/lziprecover.1 \
-      $(VPATH)/doc/lzdiff.1 $(VPATH)/doc/lzgrep.1
-
-$(VPATH)/doc/$(progname).1 : $(progname)
-	help2man -o $(VPATH)/doc/$(progname).1 ./$(progname)
-
-$(VPATH)/doc/lziprecover.1 : lziprecover
-	help2man -o $(VPATH)/doc/lziprecover.1 --no-info ./lziprecover
+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
@@ -62,15 +56,24 @@ $(VPATH)/doc/lzdiff.1 : $(VPATH)/lzdiff
 $(VPATH)/doc/lzgrep.1 : $(VPATH)/lzgrep
 	help2man -o $(VPATH)/doc/lzgrep.1 --no-info $(VPATH)/lzgrep
 
+$(VPATH)/doc/$(progname).1 : $(progname)
+	help2man -o $(VPATH)/doc/$(progname).1 ./$(progname)
+
+$(VPATH)/doc/lziprecover.1 : lziprecover
+	help2man -o $(VPATH)/doc/lziprecover.1 --no-info ./lziprecover
+
 Makefile : $(VPATH)/configure $(VPATH)/Makefile.in
 	./config.status
 
 check : all $(VPATH)/testsuite/check.sh
 	@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite
 
-install : all install-info install-man install-extra
+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
 	$(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
@@ -79,19 +82,19 @@ install-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
 	$(INSTALL_DATA) $(VPATH)/doc/$(progname).1 $(DESTDIR)$(mandir)/man1/$(progname).1
-
-install-extra : lziprecover
-	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
-	$(INSTALL_PROGRAM) ./lziprecover $(DESTDIR)$(bindir)/lziprecover
+	$(INSTALL_DATA) $(VPATH)/doc/lziprecover.1 $(DESTDIR)$(mandir)/man1/lziprecover.1
 
 install-strip : all
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
-uninstall : uninstall-info uninstall-man uninstall-extra
+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
 
 uninstall-info :
 	-install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(progname).info
@@ -100,11 +103,6 @@ uninstall-info :
 uninstall-man :
 	-rm -f $(DESTDIR)$(mandir)/man1/$(progname).1
 
-uninstall-extra :
-	-rm -f $(DESTDIR)$(bindir)/lzdiff
-	-rm -f $(DESTDIR)$(bindir)/lzgrep
-	-rm -f $(DESTDIR)$(bindir)/lziprecover
-
 dist :
 	ln -sf $(VPATH) $(DISTNAME)
 	tar -cvf $(DISTNAME).tar \
@@ -116,9 +114,12 @@ 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 \
-- 
cgit v1.2.3