X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.am;h=738c63ca17115150ba2a7d09d3a33d80840622e3;hb=a420fbafe812f9584f4e71cf3bd42f222bae74c8;hp=8fb17b9d15c065cd961c3dc48671d4056f3617fb;hpb=3471e27de87bb81abd6aa67f4391d3fce9a35437;p=debian%2Fgzip

diff --git a/Makefile.am b/Makefile.am
index 8fb17b9..738c63c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,23 +98,26 @@ gen_start_date = 2008-01-01
 gen-ChangeLog:
 	$(AM_V_GEN)if test -d .git; then				\
 	  $(top_srcdir)/build-aux/gitlog-to-changelog			\
-	    --since=$(gen_start_date) > $(distdir)/cl-t;		\
-	  rm -f $(distdir)/ChangeLog;					\
-	  mv $(distdir)/cl-t $(distdir)/ChangeLog;			\
+	    --since=$(gen_start_date) > $(distdir)/cl-t &&		\
+	    { rm -f $(distdir)/ChangeLog &&				\
+	      mv $(distdir)/cl-t $(distdir)/ChangeLog; }		\
 	fi
 
+# Prepend "." to $PATH:
+new_path = PATH=.$(PATH_SEPARATOR)$$PATH
+
 # A simple test, just of gzip -- more of a sanity check than anything else.
 FILES_TO_CHECK = $(bin_SCRIPTS) \
   $(top_srcdir)/ChangeLog $(top_srcdir)/configure $(top_srcdir)/gzip.c
 check-local: $(FILES_TO_CHECK) $(bin_PROGRAMS) gzip.doc.gz
-	$(AM_V_GEN)PATH=.:$$PATH; { test '$(srcdir)' != . \
-		       || zdiff -c gzip.doc.gz; }
-	$(AM_V_at)PATH=.:$$PATH; zdiff -c $(srcdir)/gzip.doc $(srcdir)/gzip.doc
-	$(AM_V_at)PATH=.:$$PATH; zdiff $(srcdir)/gzip.doc gzip.doc.gz
-	$(AM_V_at)PATH=.:$$PATH; zdiff -c - $(srcdir)/gzip.doc <gzip.doc.gz
-	$(AM_V_at)PATH=.:$$PATH; zdiff -c gzip.doc.gz gzip.doc.gz
-	$(AM_V_at)PATH=.:$$PATH; zgrep -iV >/dev/null
-	$(AM_V_at)PATH=.:$$PATH;			\
+	$(AM_V_GEN)$(new_path); { test '$(srcdir)' != . \
+				    || zdiff gzip.doc.gz; }
+	$(AM_V_at)$(new_path); zdiff $(srcdir)/gzip.doc $(srcdir)/gzip.doc
+	$(AM_V_at)$(new_path); zdiff $(srcdir)/gzip.doc gzip.doc.gz
+	$(AM_V_at)$(new_path); zdiff - $(srcdir)/gzip.doc <gzip.doc.gz
+	$(AM_V_at)$(new_path); zdiff gzip.doc.gz gzip.doc.gz
+	$(AM_V_at)$(new_path); zgrep -iV >/dev/null
+	$(AM_V_at)$(new_path);				\
 	for opt in --rsyncable '' -1 -9; do		\
           for file in $(FILES_TO_CHECK); do		\
             gzip $$opt -c -- "$$file"			\