From 71016039828718351e35f35dcda53b0492a0cc16 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Sun, 15 Dec 2019 09:57:40 +0100
Subject: [PATCH] Ensure that PRAGMA_COLUMNS etc can be overridden

---
 src/ui/gui/automake.mk          | 8 ++++----
 src/ui/gui/include/gtk/gtk.in.h | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 446c82427a..4dbba029e3 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -419,10 +419,10 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
 	@$(MKDIR_P) src/ui/gui/include/gtk
 	$(AM_V_GEN)rm -f $@-t $@ && \
 	{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-	  $(SED) -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-	      -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-	      -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-	      -e 's|@''NEXT_GTK_GTK_H''@|$(NEXT_GTK_GTK_H)|g' \
+	  $(SED) -e 's|%''INCLUDE_NEXT''%|$(INCLUDE_NEXT)|g' \
+	      -e 's|%''PRAGMA_SYSTEM_HEADER''%|$(PRAGMA_SYSTEM_HEADER)|g' \
+	      -e 's|%''PRAGMA_COLUMNS''%|$(PRAGMA_COLUMNS)|g' \
+	      -e 's|%''NEXT_GTK_GTK_H''%|$(NEXT_GTK_GTK_H)|g' \
 	      < $(srcdir)/src/ui/gui/include/gtk/gtk.in.h; \
 	} > $@-t && \
 	mv $@-t $@
diff --git a/src/ui/gui/include/gtk/gtk.in.h b/src/ui/gui/include/gtk/gtk.in.h
index 8df67cd0cc..ab97cd7afa 100644
--- a/src/ui/gui/include/gtk/gtk.in.h
+++ b/src/ui/gui/include/gtk/gtk.in.h
@@ -18,11 +18,11 @@
 #define PSPP_GTK_GTK_H
 
 #if __GNUC__ >= 3
-@PRAGMA_SYSTEM_HEADER@
+%PRAGMA_SYSTEM_HEADER%
 #endif
-@PRAGMA_COLUMNS@
+%PRAGMA_COLUMNS%
 
-#@INCLUDE_NEXT@ @NEXT_GTK_GTK_H@
+#%INCLUDE_NEXT% %NEXT_GTK_GTK_H%
 
 
 #ifndef G_CONST_RETURN
-- 
2.30.2