diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-05-15 13:30:11 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-05-15 14:23:39 +0300 |
| commit | 07976ee1de03ab558fd1fe6f921514c8250cee02 (patch) | |
| tree | 0938fba129d146b5d67e9d0ffdfece8b42ee7863 /embeddedobj | |
| parent | 3f70a6c0f8adec171ffd228d109d59bf81dcd39f (diff) | |
Don't export a variable called PATH_SEPARATOR
It used to be mis-spelled PATH_SEPERATOR. Now, after correcting the spelling,
it breaks the build of 3rd-party libraries using autoconfigury on Windows. The
value of PATH_SEPARATOR is ";" on Windows, and the configure scripts of those
libs run in Cygwin and assume that a PATH_SEPARATOR environment variable
should be correct for Cygwin. Which ";" isn't.
Rename the variable to LIBO_PATH_SEPARATOR.
Change-Id: Iff0eb93bf11d9f844a28be7ea4456e4c0ae10844
Diffstat (limited to 'embeddedobj')
| -rw-r--r-- | embeddedobj/test/Container1/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/embeddedobj/test/Container1/makefile.mk b/embeddedobj/test/Container1/makefile.mk index fed903410b0e..f2523cae5a4f 100644 --- a/embeddedobj/test/Container1/makefile.mk +++ b/embeddedobj/test/Container1/makefile.mk @@ -25,9 +25,9 @@ PACKAGE = embeddedobj$/test .INCLUDE: settings.mk # EXEC_CLASSPATH_TMP = \ -# $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(PATH_SEPARATOR) +# $(foreach,i,$(JARFILES) $(SOLARBINDIR)$/$i)$(LIBO_PATH_SEPARATOR) # EXEC_CLASSPATH = \ -# $(strip $(subst,!,$(PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) +# $(strip $(subst,!,$(LIBO_PATH_SEPARATOR) $(EXEC_CLASSPATH_TMP:s/ /!/))) #----- compile .java files ----------------------------------------- @@ -66,11 +66,11 @@ JavaStorageTestExample : $(CLASSFILES) # echo $(EXEC_CLASSPATH) run: $(CLASSFILES) - +set PATH=$(PATH)$(PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \ + +set PATH=$(PATH)$(LIBO_PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \ java -classpath "$(OUT)$/class;$(OUT)$/lib;$(OUT)$/bin;$(JDK14PATH)$/jre$/bin;$(JDK14PATH)$/jre$/lib;$(CLASSPATH)" embeddedobj.test.EmbedContFrame debug: $(CLASSFILES) - +set PATH=$(PATH)$(PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \ + +set PATH=$(PATH)$(LIBO_PATH_SEPARATOR)$(JDK14PATH)$/jre$/bin && \ jdb -classpath "$(OUT)$/class;$(OUT)$/lib;$(OUT)$/bin;$(CLASSPATH)" embeddedobj.test.EmbedContFrame clean : |