site.def: Only build C/en_US locales by default for Linux

[oweals/cde.git] / cde / config / cf / X11.tmpl

diff --git a/cde/config/cf/X11.tmpl b/cde/config/cf/X11.tmpl
index b5c354d7441694e4ac04144ab9ae78aa7f77f78b..3ca148d3881a8a2c9bd75d92da895d4365648769 100644 (file)
--- a/cde/config/cf/X11.tmpl
+++ b/cde/config/cf/X11.tmpl
@@ -741,14 +741,14 @@ XCOMM X Window System make variables; these need to be coordinated with rules
      XPROJECTROOT = X11ProjectRoot
 #endif
 
-#if UseInstalledX11
-              RGB = $(BINDIR)/rgb
-            FONTC = $(BINDIR)/bdftopcf
-        MKFONTDIR = $(BINDIR)/mkfontdir
-#elif defined(X11ProjectRoot)
+#if defined(X11ProjectRoot)
               RGB = $(XPROJECTROOT)/bin/rgb
             FONTC = $(XPROJECTROOT)/bin/bdftopcf
         MKFONTDIR = $(XPROJECTROOT)/bin/mkfontdir
+#elif UseInstalledX11
+              RGB = $(BINDIR)/rgb
+            FONTC = $(BINDIR)/bdftopcf
+        MKFONTDIR = $(BINDIR)/mkfontdir
 #else
               RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
             FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf
@@ -933,28 +933,6 @@ SharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),SOOLDXREV,SharedOldXRev)
 ProjectUnsharedLibReferences(OLDX,oldX,$(OLDXLIBSRC),XBuildLibDir)
 #endif
 
-#ifndef SharedLibXp
-#define SharedLibXp HasSharedLibraries
-#endif
-#ifndef NormalLibXp
-#define NormalLibXp (!SharedLibXp | ForceNormalLib)
-#endif
-#ifndef DebugLibXp
-#define DebugLibXp              NO      /* debugged Xp library */
-#endif
-#ifndef ProfileLibXp
-#define ProfileLibXp            NO      /* profiled Xp library */
-#endif
-         XPLIBSRC = $(LIBSRC)/Xp
-#if SharedLibXp
-#ifndef SharedXpRev
-#define SharedXpRev 6.2
-#endif
-SharedLibReferences(XP,Xp,$(XPLIBSRC),SOXPREV,SharedXpRev)
-#else
-ProjectUnsharedLibReferences(XP,Xp,$(XPLIBSRC),XBuildLibDir)
-#endif
-
 #ifndef SharedLibXt
 #define SharedLibXt HasSharedLibraries
 #endif