version 1.8

[debian/gzip] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b01ddee020afd808535e7bcd6f8ed9843b96d055..738c63ca17115150ba2a7d09d3a33d80840622e3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,6 @@ SUFFIXES = .in
 .in:
        $(AM_V_GEN)sed \
                -e 's|/bin/sh|$(SHELL)|g' \
-               -e 's|[@]bindir@|'\''$(bindir)'\''|g' \
                -e 's|[@]GREP@|$(GREP)|g' \
                -e 's|[@]VERSION@|$(VERSION)|g' \
                $(srcdir)/$@.in >$@-t \
@@ -99,26 +98,30 @@ 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){ test '$(srcdir)' != . \
-                      || ./zdiff --__bindir . -c gzip.doc.gz; }
-       $(AM_V_at)./zdiff --__bindir . -c $(srcdir)/gzip.doc $(srcdir)/gzip.doc
-       $(AM_V_at)./zdiff --__bindir . $(srcdir)/gzip.doc gzip.doc.gz
-       $(AM_V_at)./zdiff --__bindir . -c - $(srcdir)/gzip.doc <gzip.doc.gz
-       $(AM_V_at)./zdiff --__bindir . -c gzip.doc.gz gzip.doc.gz
-       $(AM_V_at)./zgrep --__bindir . -iV >/dev/null
-       $(AM_V_at)for opt in --rsyncable '' -1 -9; do   \
+       $(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"                        \
-              | ./gzip -d | cmp - "$$file" || exit 1;  \
+            gzip $$opt -c -- "$$file"                  \
+              | gzip -d | cmp - "$$file" || exit 1;    \
           done;                                                \
        done