Fix build with make 4.2

diff --git a/debian/changelog b/debian/changelog
index 0c2b9d60df2f29fe30675fa767495580eebec261..bc311f3ba4f0706e60df20f93e76f55e74763ef5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ x264 (2:0.159.2999+git296494a-2+rpi1) bullseye-staging; urgency=medium
   * Pass --disable-asm for static build to prevent it being
     armv7/neon contaminated.
 
+  [Changes introduced in 2:0.159.2999+git296494a-2+rpi1 by Peter Michael Green]
+  * Fix build with make 4.2
+
  -- Raspbian forward porter <root@raspbian.org>  Thu, 23 Jul 2020 20:26:51 +0000
 
 x264 (2:0.159.2999+git296494a-2) unstable; urgency=medium

diff --git a/debian/rules b/debian/rules
index 101f3004b045efc6bec8562bea6b4363fcce9cd0..7bb019e2d1bb951cab04552cc267dae4bd269563 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,10 @@
 #!/usr/bin/make -f
 
-libx264N := libx264-$(shell awk '/#define X264_BUILD/{print $$3}' x264.h)
+# GNU make 4.3 changes the escaping rules for the hash sign, the reccomended
+# way to maintain compatibility with both 4.2 and 4.3 is to use a variable
+# see https://lwn.net/Articles/810071/
+HASHDEFINE:=\#define
+libx264N := libx264-$(shell awk '/$(HASHDEFINE) X264_BUILD/{print $$3}' x264.h)
 
 include /usr/share/dpkg/architecture.mk
 include debian/confflags