From 50250d834c659e3593397cc6ee691d7efc721643 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 3 Feb 2022 12:13:26 +0100
Subject: Merging upstream version 1.11.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 Makefile.in | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 55a974e..d02d15d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,13 +29,13 @@ scripts = zegrep zfgrep
 all : $(programs) $(scripts)
 
 zcat : $(zcat_objs)
-	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(zcat_objs)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zcat_objs)
 
 zcmp : $(zcmp_objs)
-	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(zcmp_objs)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zcmp_objs)
 
 zdiff : $(zdiff_objs)
-	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(zdiff_objs)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zdiff_objs)
 
 zegrep : zegrep.in
 	cat $(VPATH)/zegrep.in > $@
@@ -46,13 +46,13 @@ zfgrep : zfgrep.in
 	chmod a+x zfgrep
 
 zgrep : $(zgrep_objs)
-	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(zgrep_objs)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zgrep_objs)
 
 ztest : $(ztest_objs)
-	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(ztest_objs)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(ztest_objs)
 
 zupdate : $(zupdate_objs)
-	$(CXX) $(LDFLAGS) $(CXXFLAGS) -o $@ $(zupdate_objs)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(zupdate_objs)
 
 rc.o : rc.cc
 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROGVERSION=\"$(pkgversion)\" -DSYSCONFDIR=\"$(sysconfdir)\" -c -o $@ $<
@@ -91,27 +91,27 @@ man : $(VPATH)/doc/zcat.1 $(VPATH)/doc/zcmp.1 $(VPATH)/doc/zdiff.1 \
 
 $(VPATH)/doc/zcat.1 : zcat
 	help2man -n 'decompress and concatenate files to standard output' \
-	  -o $@ --no-info ./zcat
+	  -o $@ --info-page=$(pkgname) ./zcat
 
 $(VPATH)/doc/zcmp.1 : zcmp
 	help2man -n 'decompress and compare two files byte by byte' \
-	  -o $@ --no-info ./zcmp
+	  -o $@ --info-page=$(pkgname) ./zcmp
 
 $(VPATH)/doc/zdiff.1 : zdiff
 	help2man -n 'decompress and compare two files line by line' \
-	  -o $@ --no-info ./zdiff
+	  -o $@ --info-page=$(pkgname) ./zdiff
 
 $(VPATH)/doc/zgrep.1 : zgrep
 	help2man -n 'search compressed files for a regular expression' \
-	  -o $@ --no-info ./zgrep
+	  -o $@ --info-page=$(pkgname) ./zgrep
 
 $(VPATH)/doc/ztest.1 : ztest
 	help2man -n 'verify the integrity of compressed files' \
-	  -o $@ --no-info ./ztest
+	  -o $@ --info-page=$(pkgname) ./ztest
 
 $(VPATH)/doc/zupdate.1 : zupdate
-	help2man -n 'recompress bzip2, gzip, xz files to lzip format' \
-	  -o $@ --no-info ./zupdate
+	help2man -n 'recompress bzip2, gzip, xz, zstd files to lzip format' \
+	  -o $@ --info-page=$(pkgname) ./zupdate
 
 Makefile : $(VPATH)/configure $(VPATH)/Makefile.in
 	./config.status
-- 
cgit v1.2.3