From a166c36592644885e514061964f422e80d428587 Mon Sep 17 00:00:00 2001
From: "Matthew R. Trower" <dev@blackshard.net>
Date: Mon, 11 Jun 2018 19:59:44 -0500
Subject: [PATCH] Enable building against an arbitrary Motif installation

* Give MotifProjectRoot priority over system libs
* Switch to UseInstalledMotif (but retain necessary imports)
---
 cde/config/cf/Motif.rules | 2 +-
 cde/config/cf/Motif.tmpl  | 2 +-
 cde/config/cf/site.def    | 6 ++++--
 cde/config/cf/sun.cf      | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cde/config/cf/Motif.rules b/cde/config/cf/Motif.rules
index 8968f198..24ee12ad 100644
--- a/cde/config/cf/Motif.rules
+++ b/cde/config/cf/Motif.rules
@@ -653,7 +653,7 @@ clean::									@@\
 
 /* Search the Motif ProjectRoot too if it is different. */
 #ifdef MotifProjectRoot
-# define MUsrLibDirPath	Concat(XUsrLibDirPath,:$(MPROJECTROOT)/lib)
+# define MUsrLibDirPath	Concat($(MPROJECTROOT)/lib,:XUsrLibDirPath)
 #else
 # define MUsrLibDirPath	XUsrLibDirPath
 #endif
diff --git a/cde/config/cf/Motif.tmpl b/cde/config/cf/Motif.tmpl
index dc053ab8..f3d61265 100644
--- a/cde/config/cf/Motif.tmpl
+++ b/cde/config/cf/Motif.tmpl
@@ -73,7 +73,7 @@ XCOMM $TOG: Motif.tmpl /main/6 1999/05/19 17:00:05 mgreess $
 #endif
 
 #ifndef MTop
-# if ImportMotif
+# if ImportMotif || UseInstalledMotif
 #  define MTop $(TOP)/imports/motif
 # else
 #  define MTop $(TOP)
diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index 3b8bb82f..eb7f3438 100644
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -21,9 +21,11 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 /* CDE uses a .C suffix for C++ source, not the default .cxx */
 # define CCsuf			C
 
-/* We will import x11 and Motif. */
+/* We will import x11. */
 # define ImportX11		YES
-# define ImportMotif		YES
+
+/* We will use installed Motif. */
+# define UseInstalledMotif	YES
 
 # ifndef TopLevelProject
 #  define TopLevelProject	cde
diff --git a/cde/config/cf/sun.cf b/cde/config/cf/sun.cf
index 86f21f39..4ce766b7 100644
--- a/cde/config/cf/sun.cf
+++ b/cde/config/cf/sun.cf
@@ -376,7 +376,7 @@ man_keywords::								@@\
 #define DependDefines		-D__BUILTIN_VA_ARG_INCR
 #endif
 
-#define LdPreLib		-L/usr/X11/lib -L$(BUILDLIBDIR)
+#define LdPreLib		-L$(BUILDLIBDIR)
 #define PamUnixDefines		-DPAM_NIS
 #define TtLargePICTable		YES
 #define DtSvcDefines		-DMULTIBYTE -DNO_REGCOMP
@@ -406,7 +406,7 @@ man_keywords::								@@\
 #define TtClientExtraLibs	ExtraLibraries -ldl -lintl
 
 #ifndef TopMotifInclude
-# define TopMotifInclude	/usr/X11/include
+# define TopMotifInclude	$(MPROJECTROOT)/include
 #endif
 
 #define ShlibExportListOpt(filename)	-M filename
-- 
2.25.1