summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Rękorajski2000-06-22 13:18:50 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit5f79d7541c0b6256eee83bca78f18899de48612a (patch)
tree9487d2c8fa0d94dccddfbd6998ce6fd968b8c430
parent0328871462f0a1021b994548a4e9e2715dbd97c4 (diff)
downloadfvwm-5f79d7541c0b6256eee83bca78f18899de48612a.zip
fvwm-5f79d7541c0b6256eee83bca78f18899de48612a.tar.gz
- enable parsing fvwmrc with m4
Changed files: fvwm-enable-m4.patch -> 1.1
-rw-r--r--fvwm-enable-m4.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/fvwm-enable-m4.patch b/fvwm-enable-m4.patch
new file mode 100644
index 0000000..e2835df
--- /dev/null
+++ b/fvwm-enable-m4.patch
@@ -0,0 +1,33 @@
+diff -ur fvwm-1.24r.orig/configure.h fvwm-1.24r/configure.h
+--- fvwm-1.24r.orig/configure.h Wed Jun 21 00:50:03 2000
++++ fvwm-1.24r/configure.h Wed Jun 21 01:15:12 2000
+@@ -69,7 +69,7 @@
+ * undefine(`include') to fix that one. Some version of m4
+ * seem to give good error messages, others don't?
+ ***************************************************************************/
+-/* #define M4 */
++#define M4
+
+ /***************************************************************************
+ *#define NO_PAGER
+diff -ur fvwm-1.24r.orig/fvwm/configure.c fvwm-1.24r/fvwm/configure.c
+--- fvwm-1.24r.orig/fvwm/configure.c Wed Jun 21 00:50:03 2000
++++ fvwm-1.24r/fvwm/configure.c Wed Jun 21 01:17:42 2000
+@@ -1985,7 +1985,7 @@
+ } else {
+ strcpy(tmp_name, "/tmp");
+ }
+- strcat(tmp_name, "/fvwmrcXXXXX");
++ strcat(tmp_name, "/fvwmrcXXXXXX");
+ mktemp(tmp_name);
+
+ if (*tmp_name == '\0')
+@@ -2005,7 +2005,7 @@
+ * open a pipe to the command.
+ */
+
+- sprintf(options, "%s %s %s >& %s\n",
++ sprintf(options, "%s %s %s > %s\n",
+ m4_prog,
+ ((m4_prefix == 0) ? "" : "--prefix-builtins"),
+ m4_options, tmp_name);