From 76b7c56bde408e57424f1832d12c691ca35ea0a4 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sun, 8 Nov 2015 05:24:49 +0100
Subject: Merging upstream version 1.0~rc6.

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

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index cb987ca..bb47d57 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -13,8 +13,8 @@ zdiff_objs = arg_parser.o zutils.o zdiff.o
 scripts = zcat zegrep zfgrep zgrep ztest
 
 
-.PHONY : all install install-info install-man install-strip \
-         uninstall uninstall-info uninstall-man \
+.PHONY : all install install-bin install-info install-man install-strip \
+         uninstall uninstall-bin uninstall-info uninstall-man \
          doc info man check dist clean distclean
 
 all : $(progname) zcmp zdiff $(scripts)
@@ -67,10 +67,11 @@ $(objs)      : Makefile
 $(scripts)   : Makefile
 arg_parser.o : arg_parser.h
 main.o       : arg_parser.h zutils.h zcat.cc zgrep.cc ztest.cc
-zcmp.o       : arg_parser.h zutils.h Makefile
-zdiff.o      : arg_parser.h zutils.h Makefile
+zcmp.o       : arg_parser.h zutils.h zcmpdiff.cc Makefile
+zdiff.o      : arg_parser.h zutils.h zcmpdiff.cc Makefile
 zutils.o     : zutils.h
 
+
 doc : info man
 
 info : $(VPATH)/doc/$(pkgname).info
@@ -107,7 +108,9 @@ Makefile : $(VPATH)/configure $(VPATH)/Makefile.in
 check : all
 	@$(VPATH)/testsuite/check.sh $(VPATH)/testsuite $(pkgversion)
 
-install : all install-info install-man
+install : install-bin install-info install-man
+
+install-bin : all
 	if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi
 	$(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(progname)"
 	$(INSTALL_SCRIPT) ./zcat "$(DESTDIR)$(bindir)/zcat"
@@ -121,7 +124,7 @@ install : all install-info install-man
 install-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-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$(pkgname).info"
 
 install-man :
 	if [ ! -d "$(DESTDIR)$(mandir)/man1" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" ; fi
@@ -129,14 +132,14 @@ install-man :
 	$(INSTALL_DATA) $(VPATH)/doc/zcmp.1 "$(DESTDIR)$(mandir)/man1/zcmp.1"
 	$(INSTALL_DATA) $(VPATH)/doc/zdiff.1 "$(DESTDIR)$(mandir)/man1/zdiff.1"
 	$(INSTALL_DATA) $(VPATH)/doc/zgrep.1 "$(DESTDIR)$(mandir)/man1/zgrep.1"
-	-rm -f "$(DESTDIR)$(mandir)/man1/zegrep.1"
-	-rm -f "$(DESTDIR)$(mandir)/man1/zfgrep.1"
 	$(INSTALL_DATA) $(VPATH)/doc/ztest.1 "$(DESTDIR)$(mandir)/man1/ztest.1"
 
 install-strip : all
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
 
-uninstall : uninstall-info uninstall-man
+uninstall : uninstall-bin uninstall-info uninstall-man
+
+uninstall-bin :
 	-rm -f "$(DESTDIR)$(bindir)/$(progname)"
 	-rm -f "$(DESTDIR)$(bindir)/zcat"
 	-rm -f "$(DESTDIR)$(bindir)/zcmp"
@@ -154,8 +157,6 @@ uninstall-man :
 	-rm -f "$(DESTDIR)$(mandir)/man1/zcat.1"
 	-rm -f "$(DESTDIR)$(mandir)/man1/zcmp.1"
 	-rm -f "$(DESTDIR)$(mandir)/man1/zdiff.1"
-	-rm -f "$(DESTDIR)$(mandir)/man1/zegrep.1"
-	-rm -f "$(DESTDIR)$(mandir)/man1/zfgrep.1"
 	-rm -f "$(DESTDIR)$(mandir)/man1/zgrep.1"
 	-rm -f "$(DESTDIR)$(mandir)/man1/ztest.1"
 
-- 
cgit v1.2.3