Author: branden Date: 2004-01-13 17:49:11 -0500 (Tue, 13 Jan 2004) New Revision: 909
Modified: branches/4.3.0/sid/debian/changelog branches/4.3.0/sid/debian/rules Log: Make phony patch-audit target depend on a real one which creates a stamp file -- prompted by extreme aggravation with GNU Make when dragging the XFree86 build process through several targets by hand, and discussions with Andrew Suffield, who understands Make better than I do. Undocument phoniness of patch-audit target in changelog; "patch-audit" is phony, but its $(STAMP_DIR) counterpart is not. Modified: branches/4.3.0/sid/debian/changelog =================================================================== --- branches/4.3.0/sid/debian/changelog 2004-01-13 17:12:14 UTC (rev 908) +++ branches/4.3.0/sid/debian/changelog 2004-01-13 22:49:11 UTC (rev 909) @@ -14,9 +14,9 @@ (Closes: #225408) - debian/rules - * Add new (phony) target to rules file, "patch-audit", upon which build - targets depend. This target ensures that the patches to the upstream - source applied cleanly (no offsets, no fuzz). + * Add new target to rules file, "patch-audit", upon which build targets + depend. This target ensures that the patches to the upstream source + applied cleanly (no offsets, no fuzz). - debian/README: document new patch-audit target - debian/rules: implement new patch-audit target @@ -51,7 +51,7 @@ Eduard!). (Closes: #227217) - debian/local/FAQ - -- Branden Robinson <[EMAIL PROTECTED]> Tue, 13 Jan 2004 12:08:08 -0500 + -- Branden Robinson <[EMAIL PROTECTED]> Tue, 13 Jan 2004 17:46:21 -0500 xfree86 (4.3.0-0pre1v5) experimental; urgency=low Modified: branches/4.3.0/sid/debian/rules =================================================================== --- branches/4.3.0/sid/debian/rules 2004-01-13 17:12:14 UTC (rev 908) +++ branches/4.3.0/sid/debian/rules 2004-01-13 22:49:11 UTC (rev 909) @@ -192,15 +192,17 @@ dh_testdir # I am more anal than the dbs package maintainer about diffs, it seems. -patch-audit: $(patched) +patch-audit: $(STAMP_DIR)/patch-audit +$(STAMP_DIR)/patch-audit: $(patched) @if egrep -il '(fuzz|offset)' stampdir/log/patches/*; then \ echo "The above patches had fuzz or offsets. Please fix." >&2; \ exit 1; \ fi + touch $@ # DO NOT CHANGE THIS RULE WITHOUT CHECKING FOR SYNCHRONICITY WITH THE build-server RULE BELOW build: $(STAMP_DIR)/stamp-build -$(STAMP_DIR)/stamp-build: patch-audit $(STAMP_DIR)/genscripts +$(STAMP_DIR)/stamp-build: $(STAMP_DIR)/patch-audit $(STAMP_DIR)/genscripts dh_testdir # copy Xft stuff into exports/{lib,include} so we don't have to pull