Enable building against an arbitrary Motif installation

* Give MotifProjectRoot priority over system libs
* Switch to UseInstalledMotif (but retain necessary imports)

diff --git a/cde/config/cf/Motif.rules b/cde/config/cf/Motif.rules
index 8968f198bfee7d340e503c177c19def05e60f6a6..24ee12adfd9d4ebae78894cf3259874ec026e0f9 100644 (file)
--- 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 dc053ab8fa6cf6bb5bf483d7f18fa11b42b95758..f3d612652aee87bc452cadccf03d384f877c21f1 100644 (file)
--- 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 3b8bb82f5974212c54c1120777c53f4b58ab27a5..eb7f343840b757a9cd1f7bef387925b6e059d3a5 100644 (file)
--- 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 86f21f39eeb8c22bb8c057bff39d0fb53e6d21bf..4ce766b7c575cfc75738d60fb416073bea7eb0a5 100644 (file)
--- 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