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 6befd6c754f11c2de014d6ca4a04df9b6e992d0f..3ca148d3881a8a2c9bd75d92da895d4365648769 100644 (file)
--- a/cde/config/cf/X11.tmpl
+++ b/cde/config/cf/X11.tmpl
@@ -737,7 +737,15 @@ XCOMM X Window System make variables; these need to be coordinated with rules
 
      INSTAPPFLAGS = $(INSTDATFLAGS)    /* XXX - this should go away - XXX */
 
-#if UseInstalledX11
+#ifdef X11ProjectRoot
+     XPROJECTROOT = X11ProjectRoot
+#endif
+
+#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
@@ -767,9 +775,6 @@ XCOMM X Window System make variables; these need to be coordinated with rules
         EXTINCSRC = $(XTOP)/include/extensions
      TRANSCOMMSRC = $(LIBSRC)/xtrans
    TRANS_INCLUDES = -I$(TRANSCOMMSRC)
-#ifdef X11ProjectRoot
-     XPROJECTROOT = X11ProjectRoot
-#endif
 #ifdef BuildLibPathVar
 # ifdef SystemBuildLibPath
   SYSTEMENVLIBDIR = SystemBuildLibPath
@@ -928,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