From b9f352df59d1d84c7bab753159caea2d09a2aa20 Mon Sep 17 00:00:00 2001
From: Alex Ivanov <gnidorah@ya.ru>
Date: Tue, 8 Jan 2019 22:13:32 +0300
Subject: [PATCH] define M4Cmd

---
 cde/config/cf/FreeBSD.cf      | 1 +
 cde/config/cf/NetBSD.cf       | 1 +
 cde/config/cf/OpenBSD.cf      | 2 ++
 cde/config/cf/linux.cf        | 1 +
 cde/programs/nsgmls/Imakefile | 2 +-
 5 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index b77e31bf..faf94894 100644
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -232,6 +232,7 @@ ICONVSYSLIB != if test -f /usr/local/include/iconv.h; then echo -liconv; else ec
 #define DefaultSystemPath	/sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
 
 #define TroffCmd		groff -Tps
+#define M4Cmd			/usr/bin/m4
 #define SetTtyGroup		YES
 #define HasNdbm			YES
 #define HasShm			YES
diff --git a/cde/config/cf/NetBSD.cf b/cde/config/cf/NetBSD.cf
index 7d0cc593..627c4666 100644
--- a/cde/config/cf/NetBSD.cf
+++ b/cde/config/cf/NetBSD.cf
@@ -185,6 +185,7 @@ XCOMM operating system:  OSName
 #define NeqnCmd			neqn -Tlatin1
 #define	EqnCmd 			eqn -Tps
 #define TroffCmd        	groff -Tps
+#define M4Cmd			/usr/bin/m4
 
 /*
  * To use the NetBSD Aperture driver
diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 2d912018..a3b12533 100644
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -277,6 +277,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # define TblCmd			cat
 #endif
 
+#define M4Cmd			/usr/bin/m4
+
 #define HasGroff		YES
 
 #ifndef HasCookieMaker
diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index bfe2c0be..15136b8d 100644
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -87,6 +87,7 @@ XCOMM binutils:  (LinuxBinUtilsMajorVersion)
 #define HasMakefileSafeInclude  YES
 #define DependFileName          .depend
 #define DependCmd               $(CC) -E -MM -MG
+#define M4Cmd			/usr/bin/m4
 
 #ifdef IncludeMakefile
 # undef IncludeMakefile
diff --git a/cde/programs/nsgmls/Imakefile b/cde/programs/nsgmls/Imakefile
index 5d352764..1cb96f39 100644
--- a/cde/programs/nsgmls/Imakefile
+++ b/cde/programs/nsgmls/Imakefile
@@ -82,7 +82,7 @@ CXXOPTIONS = \
  */
 CXXTEMPLATEFLAGS = $(NOIMPLTEMPLATES)
 
-M4 = /usr/bin/m4
+M4 = M4Cmd
 
 #endif
 
-- 
2.25.1