Ensure that PRAGMA_COLUMNS etc can be overridden

diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 446c82427a06665ee879e4dcd50f97b0c4387499..4dbba029e304a14ad6639af17de5371d8b165fa4 100644 (file)
--- 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 8df67cd0cc88aaaa5e1121988650a07fa0d84717..ab97cd7afa4b727e0008a2774d1db29eefd6ff57 100644 (file)
--- 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