# HG changeset patch
# User Jiri Vanek <jvanek@redhat.com>
# Date 1551791846 -3600
# Node ID 5de5c1d74ffba32822c00ec02d7cf01175cae91b
# Parent  c081fbf99cc5513bd5d96f4f5e158895d548b321
* 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.

diff -r c081fbf99cc5 -r 5de5c1d74ffb ChangeLog
--- a/ChangeLog	Mon Mar 04 17:59:40 2019 +0100
+++ b/ChangeLog	Tue Mar 05 14:17:26 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.
+
 2019-02-28  Jiri Vanek <jvanek@redhat.com>
             Michal Vala <mvala@redhat.com>
 
diff -r c081fbf99cc5 -r 5de5c1d74ffb Makefile.am
--- a/Makefile.am	Mon Mar 04 17:59:40 2019 +0100
+++ b/Makefile.am	Tue Mar 05 14:17:26 2019 +0100
@@ -174,7 +174,7 @@
 
 NETX_JAR=$(datadir)/$(PACKAGE_NAME)/netx.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
@@ -254,9 +254,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
@@ -389,7 +391,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)
@@ -625,7 +627,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 \
@@ -696,12 +698,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)