patchupdate.py: Improve generated Makefile and delete *.ok files on error.

debian/tools/patchupdate.py

@@ -317,14 +317,20 @@ def generate_makefile(patches, fp):
     fp.write("PATCHLIST :=\t%s\n" % " \\\n\t\t".join(["%s.ok" % patch.name for i, patch in patches.iteritems()]))
     fp.write("\n")
     fp.write(".PHONY: install\n")
-    fp.write("install: $(PATCHLIST)\n")
-    fp.write("\tcat *.ok | sort | $(CURDIR)/../debian/tools/patchlist.sh | $(PATCH)\n")
-    fp.write("\tcd $(DESTDIR); autoreconf -f\n")
-    fp.write("\tcd $(DESTDIR); ./tools/make_requests\n")
-    fp.write("\trm -f *.ok\n")
+    fp.write("install:\n")
+    fp.write("\t@$(MAKE) apply; \\\n")
+    fp.write("\tstatus=$$?;     \\\n")
+    fp.write("\trm -f *.ok;     \\\n")
+    fp.write("\texit $$status\n")
     fp.write("\n")
-    fp.write(".PHONY: abort\n")
-    fp.write("abort:\n")
+    fp.write(".PHONY: apply\n")
+    fp.write("apply: $(PATCHLIST)\n")
+    fp.write("\tcat *.ok | sort | $(CURDIR)/../debian/tools/patchlist.sh | $(PATCH)\n")
+    fp.write("\tcd $(DESTDIR) && autoreconf -f\n")
+    fp.write("\tcd $(DESTDIR) && ./tools/make_requests\n")
+    fp.write("\n")
+    fp.write(".PHONY: clean\n")
+    fp.write("clean:\n")
     fp.write("\trm -f *.ok\n")
     fp.write("\n")
     fp.write(".NOTPARALLEL:\n")

patches/Makefile

@@ -26,14 +26,20 @@ PATCHLIST :=	00-Commandline.ok \
 		98-Miscellaneous.ok
 
 .PHONY: install
-install: $(PATCHLIST)
-	cat *.ok | sort | $(CURDIR)/../debian/tools/patchlist.sh | $(PATCH)
-	cd $(DESTDIR); autoreconf -f
-	cd $(DESTDIR); ./tools/make_requests
-	rm -f *.ok
+install:
+	@$(MAKE) apply; \
+	status=$$?;     \
+	rm -f *.ok;     \
+	exit $$status
 
-.PHONY: abort
-abort:
+.PHONY: apply
+apply: $(PATCHLIST)
+	cat *.ok | sort | $(CURDIR)/../debian/tools/patchlist.sh | $(PATCH)
+	cd $(DESTDIR) && autoreconf -f
+	cd $(DESTDIR) && ./tools/make_requests
+
+.PHONY: clean
+clean:
 	rm -f *.ok
 
 .NOTPARALLEL: