From f54cec0a65f44e6a38544fe5fa69b6fcf140e5dd Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien <hr@openoffice.org>
Date: Tue, 9 Nov 2004 17:33:28 +0000
Subject: [PATCH] INTEGRATION: CWS vq04 (1.147.32); FILE MERGED 2004/10/29
 01:37:03 vq 1.147.32.2: #i35982# Tidy up the patch. 2004/10/25 02:23:00 vq
 1.147.32.1: #i36028# Fix hardcoded path seperator.

---
 solenv/inc/target.mk | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 253771ce8e38..c3b0d41ad4c3 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: target.mk,v $
 #
-#   $Revision: 1.147 $
+#   $Revision: 1.148 $
 #
-#   last change: $Author: rt $ $Date: 2004-09-20 13:39:39 $
+#   last change: $Author: hr $ $Date: 2004-11-09 18:33:28 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -323,11 +323,8 @@ NEWCLASS+=$(foreach,i,$(EXTRAJARFILES) $(SOLARENV)$/bin$/$i)
 NEWCLASS+=$(CLASSGENDIR)
 .ENDIF			# "$(GENJAVACLASSFILES)"!=""
 .IF "$(NEWCLASS)"!=""
-.IF "$(GUI)"=="UNX"
-CLASSPATH:=.:$(CLASSDIR):$(XCLASSPATH):$(NEWCLASS:s/ /:/)
-.ELSE
-CLASSPATH:=.;$(CLASSDIR);$(XCLASSPATH);$(NEWCLASS:s/ /;/)
-.ENDIF
+# See iz36027 for the reason for the strange $(subst ..) construct
+CLASSPATH:=.$(PATH_SEPERATOR)$(CLASSDIR)$(PATH_SEPERATOR)$(XCLASSPATH)$(PATH_SEPERATOR){$(subst,%Z*Z%,$(PATH_SEPERATOR) $(NEWCLASS:s/ /%Z*Z%/))}
 .ENDIF			# "$(NEWCLASS)"!=""
 .ENDIF			# "$(L10N_framework)"==""