Use installed X11 includes and libs

diff --git a/cde/Makefile b/cde/Makefile
index 46168ce49ed4f1b2efd2e0dcb08636633bceec6c..76a998ff6fc64c62cf0d4d93c897b168ef536c92 100644 (file)
--- a/cde/Makefile
+++ b/cde/Makefile
@@ -131,7 +131,7 @@ Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKES
 
 imake.proto:
        cd $(IMAKESRC) && $(MAKE) $(FLAGS)
-       $(RM) $(DEPENDSRC)/Makefile.proto
+       $(RM) $(DEPENDSRC)/Makefile.proto $(DEPENDSRC)/.depend
 
 $(DEPENDSRC)/Makefile.proto:
        $(IMAKE_CMD) -s $(DEPENDSRC)/Makefile.proto -f $(DEPENDSRC)/Imakefile -DTOPDIR=$(DEPENDTOP) -DCURDIR=$(DEPENDSRC)

diff --git a/cde/config/cf/FreeBSD.cf b/cde/config/cf/FreeBSD.cf
index 32b960c469a2892e28559e08fac6edf93a342964..88d224fbdc42012659f9d32b92d7087198c66618 100644 (file)
--- a/cde/config/cf/FreeBSD.cf
+++ b/cde/config/cf/FreeBSD.cf
@@ -73,11 +73,8 @@ USE_GCC = UseGcc
 # define HasGcc2               YES
 #endif
 
-/* Use installed X11 includes/libs on FreeBSD 11+ */
-#if (OSMajorVersion >= 11)
+/* Use installed X11 includes/libs */
 #define UseInstalledX11         YES
-#endif
-
 
 /* For DtHelp TIFF processing routines. */
 #ifdef AMD64Architecture

diff --git a/cde/config/cf/NetBSD.cf b/cde/config/cf/NetBSD.cf
index 1379dfa13023c3febc91e0fb56ab922dc5dc6d82..b5861ea4a81e69a2cbfe4b654aec10dec8c30480 100644 (file)
--- a/cde/config/cf/NetBSD.cf
+++ b/cde/config/cf/NetBSD.cf
@@ -106,6 +106,8 @@ XCOMM operating system:  OSName
 #define GccGasOption           -DGCCUSESGAS
 #define AsmDefines             -DUSE_GAS
 
+/* Use installed X11 includes/libs */
+#define UseInstalledX11         YES
 
 #ifdef i386Architecture
 # ifndef OptimizedCDebugFlags

diff --git a/cde/config/cf/OpenBSD.cf b/cde/config/cf/OpenBSD.cf
index 7ceb3586ad31f1fbbb5c5a1c9da96514083af9d4..9402e199e5d83fd22b1a17c1945192fcc7c41bab 100644 (file)
--- a/cde/config/cf/OpenBSD.cf
+++ b/cde/config/cf/OpenBSD.cf
@@ -148,10 +148,8 @@ XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVe
 # endif
 #endif
 
-/* Use installed versions of Xm and X11 */
-#if OSMajorVersion >= 6
+/* Use installed X11 includes/libs */
 # define UseInstalledX11        YES
-#endif
 
 /*
  * Compiler Features

diff --git a/cde/config/cf/sun.cf b/cde/config/cf/sun.cf
index 4ce766b7c575cfc75738d60fb416073bea7eb0a5..05dc2cc17c5119c339dfc90714205ff7f2101706 100644 (file)
--- a/cde/config/cf/sun.cf
+++ b/cde/config/cf/sun.cf
@@ -376,6 +376,9 @@ man_keywords::                                                              @@\
 #define DependDefines          -D__BUILTIN_VA_ARG_INCR
 #endif
 
+/* Use installed X11 includes/libs */
+#define UseInstalledX11                YES
+
 #define LdPreLib               -L$(BUILDLIBDIR)
 #define PamUnixDefines         -DPAM_NIS
 #define TtLargePICTable                YES

diff --git a/cde/config/imake/Makefile.ini b/cde/config/imake/Makefile.ini
index f05a17de31017637704c1be795ff8f58bc6c9f27..e57026c3fb60837b9ea87a448cf057f262e3df7e 100644 (file)
--- a/cde/config/imake/Makefile.ini
+++ b/cde/config/imake/Makefile.ini
@@ -11,7 +11,7 @@
 BOOTSTRAPCFLAGS = 
 CC = cc
 CDEBUGFLAGS = -O
-INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I../../imports/x11/include/X11
+INCLUDES = -I../../include -I/usr/local/include/X11 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/X11R7/include/X11
 CFLAGS = $(BOOTSTRAPCFLAGS) $(CDEBUGFLAGS) $(INCLUDES)
 SHELL = /bin/sh
 RM = rm -f
@@ -47,7 +47,7 @@ relink:
 clean:
        $(RM) ccimake imake.o imake
        $(RM_CMD) \#*
-       $(RM) -r Makefile.proto Makefile Makefile.dep bootstrap
+       $(RM) -r Makefile.proto Makefile Makefile.dep bootstrap .depend
 
 depend: