Merging upstream version 0.7.

Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>

1 files changed, 18 insertions, 5 deletions

diff --git a/Makefile.in b/Makefile.in
index a3c14ba..edaf42f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,7 +8,7 @@ INSTALL_DIR = $(INSTALL) -d -m 755
 SHELL = /bin/sh
 
 objs = arg_parser.o main.o
-scripts = zcat zcmp zdiff zegrep zfgrep zgrep
+scripts = zcat zcmp zdiff zegrep zfgrep zgrep ztest
 
 
 .PHONY : all install install-info install-man install-strip \
@@ -47,6 +47,10 @@ zgrep : zgrep.in
 	sed -e 's,VERSION,$(progversion),g' $(VPATH)/zgrep.in > zgrep
 	chmod a+x zgrep
 
+ztest : ztest.in
+	sed -e 's,VERSION,$(progversion),g' $(VPATH)/ztest.in > ztest
+	chmod a+x ztest
+
 main.o : main.cc
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(progversion)\" -c -o $@ $<
 
@@ -65,7 +69,8 @@ info : $(VPATH)/doc/$(progname).info
 $(VPATH)/doc/$(progname).info : $(VPATH)/doc/$(progname).texinfo
 	cd $(VPATH)/doc && makeinfo $(progname).texinfo
 
-man : $(VPATH)/doc/zcat.1 $(VPATH)/doc/zdiff.1 $(VPATH)/doc/zgrep.1
+man : $(VPATH)/doc/zcat.1 $(VPATH)/doc/zdiff.1 \
+      $(VPATH)/doc/zgrep.1 $(VPATH)/doc/ztest.1
 
 $(VPATH)/doc/zcat.1 : zcat
 	help2man -n 'concatenate compressed files to stdout' \
@@ -79,6 +84,10 @@ $(VPATH)/doc/zgrep.1 : zgrep
 	help2man -n 'search compressed files for a regular expression' \
 	  -o $(VPATH)/doc/zgrep.1 --no-info ./zgrep
 
+$(VPATH)/doc/ztest.1 : ztest
+	help2man -n 'verify integrity of compressed files' \
+	  -o $(VPATH)/doc/ztest.1 --no-info ./ztest
+
 Makefile : $(VPATH)/configure $(VPATH)/Makefile.in
 	./config.status
 
@@ -86,7 +95,7 @@ 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_DIR) $(DESTDIR)$(bindir) ; fi
+	if [ ! -d $(DESTDIR)$(bindir) ] ; then $(INSTALL_DIR) $(DESTDIR)$(bindir) ; fi
 	$(INSTALL_PROGRAM) ./$(progname) $(DESTDIR)$(bindir)/$(progname)
 	$(INSTALL_SCRIPT) zcat $(DESTDIR)$(bindir)/zcat
 	$(INSTALL_SCRIPT) zcmp $(DESTDIR)$(bindir)/zcmp
@@ -94,14 +103,15 @@ install : all install-info install-man
 	$(INSTALL_SCRIPT) zegrep $(DESTDIR)$(bindir)/zegrep
 	$(INSTALL_SCRIPT) zfgrep $(DESTDIR)$(bindir)/zfgrep
 	$(INSTALL_SCRIPT) zgrep $(DESTDIR)$(bindir)/zgrep
+	$(INSTALL_SCRIPT) ztest $(DESTDIR)$(bindir)/ztest
 
 install-info :
-	if test ! -d $(DESTDIR)$(infodir) ; then $(INSTALL_DIR) $(DESTDIR)$(infodir) ; fi
+	if [ ! -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_DIR) $(DESTDIR)$(mandir)/man1 ; fi
+	if [ ! -d $(DESTDIR)$(mandir)/man1 ] ; then $(INSTALL_DIR) $(DESTDIR)$(mandir)/man1 ; fi
 	$(INSTALL_DATA) $(VPATH)/doc/zcat.1 $(DESTDIR)$(mandir)/man1/zcat.1
 	-rm -f $(DESTDIR)$(mandir)/man1/zcmp.1
 	cd $(DESTDIR)$(mandir)/man1 && ln -s zdiff.1 zcmp.1
@@ -111,6 +121,7 @@ install-man :
 	-rm -f $(DESTDIR)$(mandir)/man1/zfgrep.1
 	cd $(DESTDIR)$(mandir)/man1 && ln -s zgrep.1 zegrep.1
 	cd $(DESTDIR)$(mandir)/man1 && ln -s zgrep.1 zfgrep.1
+	$(INSTALL_DATA) $(VPATH)/doc/ztest.1 $(DESTDIR)$(mandir)/man1/ztest.1
 
 install-strip : all
 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
@@ -123,6 +134,7 @@ uninstall : uninstall-info uninstall-man
 	-rm -f $(DESTDIR)$(bindir)/zegrep
 	-rm -f $(DESTDIR)$(bindir)/zfgrep
 	-rm -f $(DESTDIR)$(bindir)/zgrep
+	-rm -f $(DESTDIR)$(bindir)/ztest
 
 uninstall-info :
 	-install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$(progname).info
@@ -135,6 +147,7 @@ uninstall-man :
 	-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
 
 dist :
 	ln -sf $(VPATH) $(DISTNAME)