diff options
| author | Martin Quinson <mquinson@debian.org> | 2005-02-24 14:05:04 +0000 |
|---|---|---|
| committer | Martin Quinson <mquinson@debian.org> | 2005-02-24 14:05:04 +0000 |
| commit | 7e86edea9eb391ba34754d668b502b84fd28a8c8 (patch) | |
| tree | 65e3cc316142f4bfdc6d982df85b5e02fb28825d /debian | |
| parent | 7efb41b9a29f0c9df7fdd0c7edd0ec940a4e4438 (diff) | |
| download | quilt-7e86edea9eb391ba34754d668b502b84fd28a8c8.tar.gz | |
I shouldn't have commited before making sure it works
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/patchsys-quilt.mk | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/debian/patchsys-quilt.mk b/debian/patchsys-quilt.mk index 7504f89..346ca6c 100644 --- a/debian/patchsys-quilt.mk +++ b/debian/patchsys-quilt.mk @@ -69,14 +69,18 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), quilt CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), patchutils -evil_patches_that_do_nasty_things := $(shell\ -if lsdiff=which lsdiff ; then \ - $$lsdiff -H $(DEB_PATCHES) \ - | egrep "/config\.(guess|sub|rpath)$" | tr "\n" " " ; \ +evil_patches_that_do_nasty_things := $(shell \ +if lsdiff=`which lsdiff` ; then \ + patchlist=`$(DEB_QUILT_CMD) series \ + | sed 's|^|$(if $(DEB_QUILT_PATCHDIR_LINK),$(DEB_QUILT_PATCHDIR_LINK)/)|' \ + | tr "\n" " "`; \ + if [ "x$$patchlist" != x ] ; then \ + $$lsdiff -H $$patchlist \ + | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \ + fi;\ fi) - ifneq (, $(evil_patches_that_do_nasty_things)) -$(warning WARNING: The following patches are modifying auto-updated files. This can result in serious trouble: $(evil_patches_that_do_nasty_things)) +$(warning WARNING: The following patches are modifying auto-updated files. This can result in serious trouble: $(evil_patches_that_do_nasty_things)) endif @@ -86,8 +90,10 @@ clean:: reverse-patches # The patch subsystem apply-patches: pre-build debian/stamp-patched -debian/stamp-patched: - $(MAKE) -f debian/rules reverse-config # must be first +debian/stamp-patched: + # reverse-config must be first + $(MAKE) -f debian/rules reverse-config + if [ -n "$(DEB_QUILT_PATCHDIR_LINK)" ] ; then \ if [ -L $(DEB_SRCDIR)/$(DEB_QUILT_PATCHDIR_LINK) ] ; then : ; else \ (cd $(DEB_SRCDIR); ln -s $(DEB_PATCHDIRS) $(DEB_QUILT_PATCHDIR_LINK)) ; \ @@ -97,10 +103,14 @@ debian/stamp-patched: # That's not an error here (but it's usefull to break loops in crude scripts) $(DEB_QUILT_CMD) push -a || test $$? = 2 touch debian/stamp-patched - $(MAKE) -f debian/rules reverse-config # must be last + + $(MAKE) -f debian/rules update-config + # update-config must be first reverse-patches: - $(MAKE) -f debian/rules reverse-config # must be first + # reverse-config must be first + $(MAKE) -f debian/rules reverse-config + if [ -d "$(DEB_SRCDIR)" ] ; then \ $(DEB_QUILT_CMD) pop -a -R || test $$? = 2 ; \ fi @@ -111,6 +121,8 @@ reverse-patches: fi rm -rf $(DEB_SRCDIR)/.pc rm -f debian/stamp-patch* - $(MAKE) -f debian/rules reverse-config # must be last + + $(MAKE) -f debian/rules update-config + # update-config must be first endif |