OpenBSD.cf: don't include xorg.cf (leftover)

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

diff --git a/cde/config/cf/X11.tmpl b/cde/config/cf/X11.tmpl
index 6befd6c754f11c2de014d6ca4a04df9b6e992d0f..b5c354d7441694e4ac04144ab9ae78aa7f77f78b 100644 (file)
--- a/cde/config/cf/X11.tmpl
+++ b/cde/config/cf/X11.tmpl
@@ -737,10 +737,18 @@ XCOMM X Window System make variables; these need to be coordinated with rules
 
      INSTAPPFLAGS = $(INSTDATFLAGS)    /* XXX - this should go away - XXX */
 
+#ifdef X11ProjectRoot
+     XPROJECTROOT = X11ProjectRoot
+#endif
+
 #if UseInstalledX11
               RGB = $(BINDIR)/rgb
             FONTC = $(BINDIR)/bdftopcf
         MKFONTDIR = $(BINDIR)/mkfontdir
+#elif defined(X11ProjectRoot)
+              RGB = $(XPROJECTROOT)/bin/rgb
+            FONTC = $(XPROJECTROOT)/bin/bdftopcf
+        MKFONTDIR = $(XPROJECTROOT)/bin/mkfontdir
 #else
               RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb
             FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf
@@ -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