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
EXTINCSRC = $(XTOP)/include/extensions
TRANSCOMMSRC = $(LIBSRC)/xtrans
TRANS_INCLUDES = -I$(TRANSCOMMSRC)
-#ifdef X11ProjectRoot
- XPROJECTROOT = X11ProjectRoot
-#endif
#ifdef BuildLibPathVar
# ifdef SystemBuildLibPath
SYSTEMENVLIBDIR = SystemBuildLibPath