Mercurial > hg > release > icedtea-web-1.8

changeset 1581:6ae6afda9284

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Makefile.am: removed dual slash between destdir and modularjdk, included CPPUNIT_FRAMEWORK_CLEAN_IMPL with, clean-unittest++-impl/plaeholder to avoid fail of unknown target when native plugin is gone. Cleaning up rust_test_tmp
author Jiri Vanek <jvanek@redhat.com>
date Tue, 05 Mar 2019 14:17:24 +0100
parents 0ab5d5c392c8
children 31a2bdd10d05
files ChangeLog Makefile.am
diffstat 2 files changed, 15 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Mar 04 17:17:51 2019 +0100
+++ b/ChangeLog	Tue Mar 05 14:17:24 2019 +0100
@@ -1,3 +1,8 @@
+2019-03-05  Lars Herschke <lhersch@dssgmbh.de>
+            
+	* Makefile.am: removed dual slash between destdir and modularjdk, included CPPUNIT_FRAMEWORK_CLEAN_IMPL with
+	clean-unittest++-impl/plaeholder to avoid fail of unknown target when native plugin is gone. Cleaning up rust_test_tmp 
+
 2019-02-28  Jiri Vanek <jvanek@redhat.com>
             Michal Vala <mvala@redhat.com>
 
--- a/Makefile.am	Mon Mar 04 17:17:51 2019 +0100
+++ b/Makefile.am	Tue Mar 05 14:17:24 2019 +0100
@@ -175,7 +175,7 @@
 
 NETX_JAR=$(datadir)/$(PACKAGE_NAME)/javaws.jar
 SPLASH_PNG=$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
-MODULARJDK_ARGS_LOCATION=$(DESTDIR)/$(MODULARJDK_ARGS_DIR)/$(MODULARJDK_ARGS_FILE)
+MODULARJDK_ARGS_LOCATION=$(DESTDIR)$(MODULARJDK_ARGS_DIR)/$(MODULARJDK_ARGS_FILE)
 
 
 # Conditional defintions
@@ -255,9 +255,11 @@
 if ENABLE_NATIVE_PLUGIN
   CPPUNIT_IMPL = run-cpp-unit-tests-impl
   CPPUNIT_CLEAN_IMPL = clean-cpp-unit-tests-impl
+  CPPUNIT_FRAMEWORK_CLEAN_IMPL = clean-unittest++-impl
 else
   CPPUNIT_IMPL = run-cpp-unit-tests-impl-placeholder
   CPPUNIT_CLEAN_IMPL = clean-cpp-unit-tests-placeholder
+  CPPUNIT_FRAMEWORK_CLEAN_IMPL = clean-unittest++-placeholder
 endif
 
 if CP_SUPPORTS_REFLINK
@@ -390,7 +392,7 @@
 	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(NETX_JAR)
 	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(SPLASH_PNG)
 	${INSTALL_DATA} $(TOP_SRC_DIR)/javaws.png $(ICONS_DEST_DIR)/
-	mkdir -p $(DESTDIR)/$(MODULARJDK_ARGS_DIR)
+	mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR)
 	cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION)
 if ENABLE_NATIVE_LAUNCHERS
 	${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
@@ -626,7 +628,7 @@
 	ar cr $(CPP_UNITTEST_FRAMEWORK_LIB) $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/*.o ; \
 	popd
 
-clean-unittest++:
+clean-unittest++-impl:
 	rm -f $(CPP_UNITTEST_FRAMEWORK_BUILDDIR)/*.o
 	rm -f $(CPP_UNITTEST_FRAMEWORK_LIB)
 	if [ -e $(CPP_UNITTEST_FRAMEWORK_BUILDDIR) ] ; then \
@@ -697,12 +699,16 @@
 	fi
 endif
 
+clean-unittest++-placeholder:
+
 clean-cpp-unit-tests-placeholder:
 	echo "plugin disabled"
 
 run-cpp-unit-tests-impl-placeholder:
 	echo "plugin disabled"
 
+clean-unittest++: $(CPPUNIT_FRAMEWORK_CLEAN_IMPL)
+
 clean-cpp-unit-tests: $(CPPUNIT_CLEAN_IMPL)
 
 run-cpp-unit-tests: $(CPPUNIT_IMPL)
@@ -1094,6 +1100,7 @@
 	rm -f launcher.build/$(itweb_settings)
 	rm -f launcher.build/$(policyeditor)
 	rm -rf launcher.in*
+	rm -rf $(TESTS_DIR)/rust_tests_tmp
 endif
 if ENABLE_SHELL_LAUNCHERS
 	rm -f launcher.build/$(javaws).sh