linux: move dependancy handling out of linux.cf and into new lnxDep.rules file.

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

diff --git a/cde/config/cf/X11.tmpl b/cde/config/cf/X11.tmpl
index b5c354d7441694e4ac04144ab9ae78aa7f77f78b..53b7f5becaee0e0a3b7b6c5766a6db901facfba2 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