diff options
| -rw-r--r-- | aclocal.m4 | 2 | ||||
| -rw-r--r-- | compat/diffstat.in | 6 | ||||
| -rw-r--r-- | compat/rpmbuild.in | 6 | ||||
| -rw-r--r-- | quilt.changes | 10 |
4 files changed, 21 insertions, 3 deletions
@@ -33,7 +33,7 @@ AC_DEFUN([QUILT_COMPAT_PROG_PATH],[ AC_PATH_PROG($1,$2,,$PATH:$4) ],[ AC_PATH_PROGS($1,$3,,$PATH:$4) - if test `expr "$$1" : '.*/\([[^/]]*\)$'` != "$2"; then + if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" fi ]) diff --git a/compat/diffstat.in b/compat/diffstat.in index f194ccf..b4f6e02 100644 --- a/compat/diffstat.in +++ b/compat/diffstat.in @@ -1,4 +1,6 @@ #! @BASH@ -echo "diffstat support has not been built into \`quilt'" >&2 -exit 1 +QUILT_COMPAT=@QUILT_DIR@/compat +QUILT_COMPAT=${QUILT_COMPAT//\//\\\/} +PATH=${PATH//$QUILT_COMPAT/} +exec "${0##*/}" "$@" diff --git a/compat/rpmbuild.in b/compat/rpmbuild.in new file mode 100644 index 0000000..b4f6e02 --- /dev/null +++ b/compat/rpmbuild.in @@ -0,0 +1,6 @@ +#! @BASH@ + +QUILT_COMPAT=@QUILT_DIR@/compat +QUILT_COMPAT=${QUILT_COMPAT//\//\\\/} +PATH=${PATH//$QUILT_COMPAT/} +exec "${0##*/}" "$@" diff --git a/quilt.changes b/quilt.changes index 89b5880..24f8727 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Jun 1 11:29:10 CEST 2006 - agruen@suse.de + +- compat/rpmbuild.in: Add a version that tries to execute a + rpmbuild that may have been installed after building quilt. +- compat/diffstat.in: Same as for compat/rpmbuild.in, try to + execute rpmbuild even though none was there at quilt build + time. +- aclocal.m4: Fix a quoting error. + +------------------------------------------------------------------- Wed May 31 17:27:55 CEST 2006 - agruen@suse.de - Fix the --with-rpmbuild option of configure. |