# HG changeset patch # User Jiri Vanek # Date 1550771984 -3600 # Node ID 7010aa9d93096bd4d2dcb79a7ac990d793c097ea # Parent a2f3b98774aba68d34c5623c2bf298b3d4342b5f Fixing bug with non existing variable MODULARJDK_ARGS diff -r a2f3b98774ab -r 7010aa9d9309 Makefile.am --- a/Makefile.am Thu Feb 21 14:17:59 2019 +0100 +++ b/Makefile.am Thu Feb 21 18:59:44 2019 +0100 @@ -175,7 +175,7 @@ NETX_JAR=$(datadir)/$(PACKAGE_NAME)/javaws.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 @@ -391,7 +391,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)