Mercurial > hg > release > icedtea-web-1.7
changeset 1397:1e0fcdc4f72e
Merge
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Mon, 24 Apr 2017 10:06:48 +0200 |
| parents | 69a8f501e9d2 (current diff) cfc79c081af1 (diff) |
| children | 0789465aecc8 |
| files | ChangeLog |
| diffstat | 2 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Apr 24 10:02:33 2017 +0200 +++ b/ChangeLog Mon Apr 24 10:06:48 2017 +0200 @@ -3,6 +3,17 @@ fixed PR3365 * icedteaweb-completion.in: _itweb-settings renamed to _itwebsettings +2017-04-11 Michal Vala <mvala@redhat.com> + Jiri Vanek <jvanek@redhat.com> + + * .Makefile.am: on windows, replace prefix by its cygwin path + +2017-04-10 Michal Vala <mvala@redhat.com> + Jiri Vanek <jvanek@redhat.com> + + fixed quoting wrongly interpreted by cigwin + * Makefile.am: LAUNCHER_BOOTCLASSPATH now using ' instead of " + 2017-04-10 Jiri Vanek <jvanek@redhat.com> Reproduced issue PR3351
--- a/Makefile.am Mon Apr 24 10:02:33 2017 +0200 +++ b/Makefile.am Mon Apr 24 10:06:48 2017 +0200 @@ -19,6 +19,7 @@ if WINDOWS export TOP_BUILD_DIR := $(shell cygpath -p -m "$(abs_top_builddir)") export TOP_SRC_DIR := $(shell cygpath -p -m "$(abs_top_srcdir)") + export prefix := $(shell cygpath -p -m "$(prefix)") else export TOP_BUILD_DIR = $(abs_top_builddir) export TOP_SRC_DIR = $(abs_top_srcdir) @@ -155,7 +156,7 @@ export UNIFIED_JACOCO_CLASSPATH=$(call joinsegments, $(UNIFIED_JACOCO_CLASSPATH_SEGMENTS)) export UNIFIED_BOOTCLASSPATH=-Xbootclasspath/a:$(UNIFIED_CLASSPATH) # note javaws, itwebsettings and policyeditor (== LAUNCHER_BOOTCLASSPATH) must be always able to compile and run *without* plugin -export LAUNCHER_BOOTCLASSPATH="$(UNIFIED_BOOTCLASSPATH)" +export LAUNCHER_BOOTCLASSPATH='$(UNIFIED_BOOTCLASSPATH)' export PLUGIN_BOOTCLASSPATH='"$(UNIFIED_BOOTCLASSPATH)"' export PLUGIN_COVERAGE_BOOTCLASSPATH='"-Xbootclasspath/a:$(UNIFIED_JACOCO_CLASSPATH)"'