--- a/ChangeLog	Fri May 12 17:20:19 2017 +0200
+++ b/ChangeLog	Mon May 15 12:05:16 2017 +0200
@@ -1,3 +1,17 @@
+2017-12-10  Alex Kashchenko <akashche@redhat.com>
+            Jiri Vanek <jvanek@redhat.com>
+
+	Used absolute dirs, win installer work done in special folder, better WiX detection, win installer clean
+	* Makefile.am: introduced WIN_INSTALLER_DIR putting win-installer.build to abs build dir
+	introduced WIN_INSTALLER_SRC_DIR to put win-installer to abs src dir. clean-win-installer, new target,
+	cleaning  installer. installer.json and win-installer targets now using correct path macros. All work done
+	done in special dir
+	* acinclude.m4: WIX_TOOLSET_DIR is now striped only once, so it wrks well for both bin(msi) and no  bin(zip)
+	WiX isntallations
+	* configure.ac: wixgen.jar added more defaults to try
+	* win-installer/installer.json.in: adapted to work in different subdirectory (hot candidate for sed)
+
+
 2017-12-10  Alex Kashchenko <akashche@redhat.com>
             Jiri Vanek <jvanek@redhat.com>
             Michal Vala <mvala@redhat.com>

--- a/Makefile.am	Fri May 12 17:20:19 2017 +0200
+++ b/Makefile.am	Mon May 15 12:05:16 2017 +0200
@@ -29,6 +29,8 @@
 	WIN_LAUNCHERS=
 endif
 
+export WIN_INSTALLER_DIR = $(TOP_BUILD_DIR)/win-installer.build
+export WIN_INSTALLER_SRC_DIR = $(TOP_SRC_DIR)/win-installer
 export NETX_DIR = $(TOP_BUILD_DIR)/netx.build
 export DOCS_DIR=$(TOP_BUILD_DIR)/icedtea-web-docs/$(FULL_VERSION)
 export NETX_SRCDIR = $(TOP_SRC_DIR)/netx
@@ -296,7 +298,7 @@
 check-local: $(RHINO_TESTS) $(JUNIT_TESTS)
 
 clean-local: clean-netx clean-plugin clean-liveconnect \
- clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-metadata  clean-icedteaweb-completion clean-tests clean-bootstrap-directory
+ clean-native-ecj clean-launchers clean-desktop-files clean-docs clean-generated-docs clean-metadata  clean-icedteaweb-completion clean-tests clean-bootstrap-directory clean-win-installer
 	if [ -e stamps ] ; then \
 	  rmdir stamps ; \
 	fi
@@ -304,7 +306,7 @@
 .PHONY: clean-IcedTeaPlugin clean-add-netx clean-add-netx-debug clean-add-plugin clean-add-plugin-debug \
  clean-bootstrap-directory clean-native-ecj clean-desktop-files clean-netx-docs clean-docs clean-plugin-docs clean-generated-docs clean-icedteaweb-completion\
  clean-tests check-local clean-launchers stamps/check-pac-functions.stamp stamps/run-netx-unit-tests.stamp clean-netx-tests \
- clean-junit-runner clean-netx-unit-tests clean-metadata win-installer
+ clean-junit-runner clean-netx-unit-tests clean-metadata win-installer clean-win-installer
 
 install-exec-local:
 	${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir) $(ICONS_DEST_DIR) $(BASH_CMPL_DEST_DIR)
@@ -391,15 +393,17 @@
 	cp $(TOP_BUILD_DIR)/liveconnect/lib/src.zip $(DESTDIR)$(prefix)/plugin.src.zip
 endif
 
-
-installer.json:
-	sed -e s/[@]PACKAGE_VERSION[@]/$(PACKAGE_VERSION)/g win-installer/installer.json.in > $@
+clean-win-installer:
+	rm -rf $(WIN_INSTALLER_DIR)
 
-win-installer: win-only-image installer.json
-	rm -vf installer.wxs
-	"$(JAVA)" -jar "$(WIXGEN_JAR)" "$(DESTDIR)$(prefix)" -c installer.json -o installer.wxs
-	"$(WIX_TOOLSET_DIR)"/candle.exe /nologo installer.wxs
-	"$(WIX_TOOLSET_DIR)"/light.exe /nologo -ext WixUIExtension installer.wixobj
+$(WIN_INSTALLER_DIR)/installer.json: clean-win-installer
+	mkdir $(WIN_INSTALLER_DIR)
+	sed -e s/[@]PACKAGE_VERSION[@]/$(PACKAGE_VERSION)/g $(WIN_INSTALLER_SRC_DIR)/installer.json.in > $@
+
+win-installer: win-only-image $(WIN_INSTALLER_DIR)/installer.json
+	"$(JAVA)" -jar "$(WIXGEN_JAR)" "$(DESTDIR)$(prefix)" -c $(WIN_INSTALLER_DIR)/installer.json -o $(WIN_INSTALLER_DIR)/installer.wxs
+	cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/candle.exe /nologo installer.wxs
+	cd $(WIN_INSTALLER_DIR) && "$(WIX_TOOLSET_DIR)"/light.exe /nologo -ext WixUIExtension installer.wixobj
 endif
 
 # note that this is called only from windows specific target (hidden otherwise)

--- a/acinclude.m4	Fri May 12 17:20:19 2017 +0200
+++ b/acinclude.m4	Mon May 15 12:05:16 2017 +0200
@@ -1107,7 +1107,7 @@
   if test x"${WIX_TOOLSET_DIR}" = x; then
     SYSTEM_CANDLE_IN_PATH="$(which candle.exe 2>&AS_MESSAGE_LOG_FD)"
     if test -f "${SYSTEM_CANDLE_IN_PATH}" ; then
-        WIX_TOOLSET_DIR="$(dirname "$(dirname "$(cygpath -m "${SYSTEM_CANDLE_IN_PATH}")")")"
+        WIX_TOOLSET_DIR="$(dirname "$(cygpath -m "${SYSTEM_CANDLE_IN_PATH}")")"
     fi
   fi
   if ! test -d "${WIX_TOOLSET_DIR}"; then

--- a/configure.ac	Fri May 12 17:20:19 2017 +0200
+++ b/configure.ac	Mon May 15 12:05:16 2017 +0200
@@ -154,10 +154,11 @@
     [/usr/share/java/jacoco/org.jacoco.core.jar])
 IT_FIND_OPTIONAL_JAR([asm], ASM,
     [/usr/share/java/objectweb-asm4/asm-all.jar /usr/share/java/objectweb-asm4/asm-all-4.0.jar /usr/share/java/objectweb-asm/asm-all.jar])
-IT_FIND_OPTIONAL_JAR([wixgen], WIXGEN, [/usr/share/java/wixgen.jar])
 if test "x$build_windows" = xyes ; then
   IT_CHECK_FOR_WIX
 fi
+IT_FIND_OPTIONAL_JAR([wixgen], WIXGEN, [/usr/share/java/wixgen.jar $WIX_TOOLSET_DIR/wixgen.jar $WIX_TOOLSET_DIR/../wixgen.jar])
+
 echo -n "checking for MSI deps... "
 if test "x$WIX_TOOLSET_DIR" = "x" ; then
   if test "x$WIXGEN_JAR" = "x" ; then

--- a/win-installer/installer.json.in	Fri May 12 17:20:19 2017 +0200
+++ b/win-installer/installer.json.in	Mon May 15 12:05:16 2017 +0200
@@ -10,10 +10,10 @@
   "productUuid": "03ae99a2-d9b6-46af-9841-c4b810289b1b",
   "updateUuid": "ff98de21-a283-40be-b0a5-74a6a4219de8",
   "vendorDirName": "IcedTeaWeb",
-  "licenseFilePath": "win-installer/LICENSE.rtf",
-  "iconPath": "win-installer/icon.ico",
-  "topBannerBmpPath": "win-installer/top_banner.bmp",
-  "greetingsBannerBmpPath": "win-installer/greetings_banner.bmp",
+  "licenseFilePath": "../win-installer/LICENSE.rtf",
+  "iconPath": "../win-installer/icon.ico",
+  "topBannerBmpPath": "../win-installer/top_banner.bmp",
+  "greetingsBannerBmpPath": "../win-installer/greetings_banner.bmp",
   "useFeatureTree": false,
   "featureId": "itw",
   "featureTitle": "IcedTea-Web",