--- config/cf/X11.tmpl.orig	Tue Jan 15 14:55:26 2002
+++ config/cf/X11.tmpl	Mon Sep  2 13:28:05 2002
@@ -1380,7 +1380,14 @@
 #endif
 
 #ifndef PsWrap
+#if defined(UseInstalled) || defined(UseInstalledPrograms)
+#define PsWrap pswrap
+#define PsWrapDependency /**/
+#else
 #define PsWrap $(PSWRAPSRC)/pswrap
+#define PsWrapDependency ProgramTargetName($(PSWRAP))
+#endif
+         PSWRAP = PsWrap
 #endif
 
 #ifndef ResourceConfigurationManagement 
@@ -2622,7 +2629,7 @@
 FREETYPE2DIR = Freetype2Dir
 FREETYPE2LIBDIR = Freetype2LibDir
 FREETYPE2INCDIR = Freetype2IncDir
-FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)
+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) -I$(FREETYPE2DIR)/include
 FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype
 FREETYPE2DEFINES = -DFREETYPE2
 #endif
