Merge branch 'master' of ssh://git.code.sf.net/p/cdesktopenv/code

[oweals/cde.git] / cde / config / cf / site.def

diff --git a/cde/config/cf/site.def b/cde/config/cf/site.def
index 2cdc401c47ae5401814d725e0e21332d3109bea4..9404bd93572d8a3b0728ff137c10665b303eff93 100644 (file)
--- a/cde/config/cf/site.def
+++ b/cde/config/cf/site.def
@@ -66,13 +66,17 @@ XCOMM site:  $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
 
 #ifdef AfterVendorCF
 
+#ifndef X11ProjectRoot
 # if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
 #  define X11ProjectRoot       /usr
 # else
 #  define X11ProjectRoot       /X11
 # endif
+#endif
 
+#ifndef ProjectRoot
 # define ProjectRoot   /usr/dt
+#endif
 
 #ifdef SunArchitecture
 # define DtLocalesToBuild de_DE.ISO8859-1 es_ES.ISO8859-1 fr_FR.ISO8859-1 it_IT.ISO8859-1