patchupdate.py: Define $(APPLY) macro, rename $(APPLY_PATCH) -> $(APPLY_FILE).

debian/tools/Makefile.in

@@ -4,16 +4,15 @@
 
 CURDIR ?= ${{.CURDIR}}
 PATCH := $(CURDIR)/../debian/tools/gitapply.sh
+APPLY := (cd $(DESTDIR) && $(PATCH))
+APPLY_FILE = @echo "Applying $(1)"; $(APPLY) < $(CURDIR)/$(1)
 
-APPLY_PATCH = \
-	@echo "Applying $(1)"; \
-	cd $(DESTDIR) && $(PATCH) < $(CURDIR)/$(1)
-
-PATCHLIST :=	{patchlist}
+PATCHLIST := \
+{patchlist}
 
 .PHONY: install
 install: $(PATCHLIST)
-	cat *.ok | sort | $(CURDIR)/../debian/tools/patchlist.sh | (cd $(DESTDIR) && $(PATCH))
+	cat *.ok | sort | $(CURDIR)/../debian/tools/patchlist.sh | $(APPLY)
 	cd $(DESTDIR) && autoreconf -f
 	cd $(DESTDIR) && ./tools/make_requests
 

debian/tools/patchupdate.py

@@ -417,7 +417,7 @@ def generate_makefile(all_patches, fp):
 
     with open(config.path_template_Makefile) as template_fp:
         template = template_fp.read()
-    fp.write(template.format(patchlist=" \\\n\t\t".join(["%s.ok" % patch.name for i, patch in all_patches.iteritems()])))
+    fp.write(template.format(patchlist="\t" + " \\\n\t".join(["%s.ok" % patch.name for i, patch in all_patches.iteritems()])))
 
     for i, patch in all_patches.iteritems():
         fp.write("# Patchset %s\n" % patch.name)
@@ -452,7 +452,7 @@ def generate_makefile(all_patches, fp):
         depends = " ".join([""] + ["%s.ok" % all_patches[d].name for d in patch.depends]) if len(patch.depends) else ""
         fp.write("%s.ok:%s\n" % (patch.name, depends))
         for f in patch.files:
-            fp.write("\t$(call APPLY_PATCH,%s)\n" % os.path.join(patch.name, f))
+            fp.write("\t$(call APPLY_FILE,%s)\n" % os.path.join(patch.name, f))
 
         # Create *.ok file (used to generate patchlist)
         if len(patch.authors):