[gs-cvs] rev 9404 - trunk/gs/psi

[giles at ghostscript.com]

Author: giles
Date: 2009-01-26 16:18:29 -0800 (Mon, 26 Jan 2009)
New Revision: 9404

Modified:
   trunk/gs/psi/dwsetup.cpp
Log:
Remove $(GS_LIB)\Resource directory from the search path in the msvc 
build to shadowing the compiled in version.

GS_LIB is set in the Windows registery by the installer, but it does not 
currently install a duplicate copy of the Resource tree in the 
filesystem. Having this directory in the search path caused Ghostscript 
to use it for Resource lookup to the exclusion of the %rom% version, and 
since the files weren't installed there, Ghostscript would error out in 
the initialization phase.

Files like cidfmap and available fonts can still be overridden by 
putting them in $(GS_LIB)\lib and $(GS_LIB)\fonts.

Patch from Russell Lang.


Modified: trunk/gs/psi/dwsetup.cpp
===================================================================
--- trunk/gs/psi/dwsetup.cpp	2009-01-26 19:25:28 UTC (rev 9403)
+++ trunk/gs/psi/dwsetup.cpp	2009-01-27 00:18:29 UTC (rev 9404)
@@ -760,11 +760,7 @@
 	strcat(szLIB, cinst.GetMainDir());
 	strcat(szLIB, "\\lib;");
 	strcat(szLIB, g_szTargetDir);
-	strcat(szLIB, "\\fonts;");
-	strcat(szLIB, g_szTargetDir);
-	strcat(szLIB, "\\");
-	strcat(szLIB, cinst.GetMainDir());
-	strcat(szLIB, "\\Resource");
+	strcat(szLIB, "\\fonts");
 	if (g_bCJKFonts) {
 	    strcat(szLIB, ";");
 	    get_font_path(szLIB+strlen(szLIB), sizeof(szLIB)-strlen(szLIB)-1);