# HG changeset patch # User Jiri Vanek # Date 1551102764 -3600 # Node ID 3f0fe1af74684d492e3c3e5f08832a0126349978 # Parent c22a4cd06fccce647d25f15095a24dd65577f55b Fixing bug with non existing variable MODULARJDK_ARGS diff -r c22a4cd06fcc -r 3f0fe1af7468 Makefile.am --- a/Makefile.am Mon Feb 25 14:51:41 2019 +0100 +++ b/Makefile.am Mon Feb 25 14:52:44 2019 +0100 @@ -174,7 +174,7 @@ NETX_JAR=$(datadir)/$(PACKAGE_NAME)/netx.jar SPLASH_PNG=$(datadir)/$(PACKAGE_NAME)/javaws_splash.png -MODULARJDK_ARGS_LOCATION=$(MODULARJDK_ARGS_DIR)/$(MODULARJDK_ARGS_FILE) +MODULARJDK_ARGS_LOCATION=$(DESTDIR)/$(MODULARJDK_ARGS_DIR)/$(MODULARJDK_ARGS_FILE) # Conditional defintions @@ -390,7 +390,7 @@ ${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) - cp launcher.build/$(MODULARJDK_ARGS_FILE) $(DESTDIR)/$(MODULARJDK_ARGS_DIR)/$(MODULARJDK_ARGS) + cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION) if ENABLE_NATIVE_LAUNCHERS ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir) ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)