diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | lib/apatch.in | 6 | ||||
| -rw-r--r-- | lib/patchfns.in | 2 | ||||
| -rwxr-xr-x | lib/rpatch.in | 8 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/diff.in | 2 |
6 files changed, 16 insertions, 12 deletions
@@ -13,6 +13,8 @@ LIB_DIR = $(datadir)/$(PACKAGE)/lib PERL := /usr/bin/perl BASH := /bin/bash +DIFF := /usr/bin/diff +PATCH := /usr/bin/patch CFLAGS = -g -Wall @@ -137,5 +139,7 @@ clean distclean : -e "s:@QUILT@:$(QUILT_DIR):g" \ -e "s:@PERL@:$(PERL):g" \ -e "s:@BASH@:$(BASH):g" \ + -e "s:@DIFF@:$(DIFF):g" \ + -e "s:@PATCH@:$(PATCH):g" \ $< > $@ @chmod --reference=$< $@ diff --git a/lib/apatch.in b/lib/apatch.in index 593b32f..e737255 100755 --- a/lib/apatch.in +++ b/lib/apatch.in @@ -55,15 +55,15 @@ apply_patch() if [ "x${patch_file:(-3)}" = "x.gz" ] then gzip -cd $patch_file \ - | patch $(patch_args $patch) --no-backup-if-mismatch \ + | @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -E $silent elif [ "x${patch_file:(-4)}" = "x.bz2" ] then bzip2 -cd $patch_file \ - | patch $(patch_args $patch) --no-backup-if-mismatch \ + | @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -E $silent else - patch $(patch_args $patch) --no-backup-if-mismatch \ + @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -E $silent -i $patch_file fi } diff --git a/lib/patchfns.in b/lib/patchfns.in index b4123c9..e5be4f5 100644 --- a/lib/patchfns.in +++ b/lib/patchfns.in @@ -528,7 +528,7 @@ diff_file() fi echo Index: $new_hdr - diff -Nu $DIFF_OPTS $old_file $new_file | + @DIFF@ -Nu $DIFF_OPTS $old_file $new_file | fix_diff_header $old_hdr $new_hdr } diff --git a/lib/rpatch.in b/lib/rpatch.in index 2d39bf1..73f8ac6 100755 --- a/lib/rpatch.in +++ b/lib/rpatch.in @@ -44,7 +44,7 @@ verify_removal() echo "Patch does not remove changes:" fi - diff -Nu $DIFF_OPTS $bup $file \ + @DIFF@ -Nu $DIFF_OPTS $bup $file \ | sed -e 's:^--- [^ \t]*:--- '"$dir/$file.orig"':' \ -e 's:^+++ [^ \t]*:+++ '"$dir/$file"':' @@ -117,15 +117,15 @@ reverse_patch() if [ "x${patch_file:(-3)}" = "x.gz" ] then gzip -cd $patch_file \ - | patch $(patch_args $patch) --no-backup-if-mismatch \ + | @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -R -E $silent elif [ "x${patch_file:(-4)}" = "x.bz2" ] then bzip2 -cd $patch_file \ - | patch $(patch_args $patch) --no-backup-if-mismatch \ + | @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -R -E $silent else - patch $(patch_args $patch) --no-backup-if-mismatch \ + @PATCH@ $(patch_args $patch) --no-backup-if-mismatch \ -R -E $silent -i $patch_file fi } diff --git a/quilt.changes b/quilt.changes index 19663e9..cffa632 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,9 +1,9 @@ ------------------------------------------------------------------- -Thu Jan 30 13:06:36 CET 2003 - agruen@suse.de +Thu Jan 30 13:25:51 CET 2003 - agruen@suse.de - Fix some regex quoting; use grep -E because we quote for extended regexps. Filenames with "+^$" in it did not work in some places. -- Prepare for GNU Autoconf: substitute @PERL@ and @BASH@ in - scripts. +- Prepare for GNU Autoconf: substitute @PERL@, @BASH@, @DIFF@, + @PATCH@ in scripts. - Some cleanups in Makefile. ------------------------------------------------------------------- diff --git a/quilt/diff.in b/quilt/diff.in index b42837a..7f50b61 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -187,7 +187,7 @@ then if [ -s $pwd/$patch_file ] then if ! cat_file $pwd/$patch_file \ - | patch $patch_args --no-backup-if-mismatch \ + | @PATCH@ $patch_args --no-backup-if-mismatch \ -E >/dev/null 2>/dev/null then echo "Failed to patch temporary files" |