changeset 1429:3ef0ab04f480

Makefile.am: (install-exec-local) completion files installed last
author Jiri Vanek <jvanek@redhat.com>
date Fri, 12 May 2017 09:08:42 +0200
parents 3b8cef4be396
children 8d77c2e0618c
files ChangeLog Makefile.am
diffstat 2 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu May 11 18:05:40 2017 +0200
+++ b/ChangeLog	Fri May 12 09:08:42 2017 +0200
@@ -1,3 +1,7 @@
+2017-12-10  Jiri Vanek <jvanek@redhat.com>
+
+	* Makefile.am: (install-exec-local) completion files installed last
+
 2017-05-11  Jiri Vanek <jvanek@redhat.com>
 
 	* launcher/launchers.bat.in: hardcoded Xnofork, as it is necessary anyway
--- a/Makefile.am	Thu May 11 18:05:40 2017 +0200
+++ b/Makefile.am	Fri May 12 09:08:42 2017 +0200
@@ -318,9 +318,6 @@
 	${INSTALL_DATA} $(NETX_DIR)/lib/classes.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/netx.jar
 	${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/javaws_splash.png
 	${INSTALL_DATA} $(TOP_SRC_DIR)/javaws.png $(ICONS_DEST_DIR)/
-	${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/itweb-settings.bash $(BASH_CMPL_DEST_DIR)/
-	${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/javaws.bash $(BASH_CMPL_DEST_DIR)/
-	${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/policyeditor.bash $(BASH_CMPL_DEST_DIR)/
 	${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir)
 	${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
 	${INSTALL_PROGRAM} launcher.build/$(policyeditor) $(DESTDIR)$(bindir)
@@ -329,6 +326,9 @@
 	${INSTALL_PROGRAM} launcher.build/$(itweb_settings).bat $(DESTDIR)$(bindir)
 	${INSTALL_PROGRAM} launcher.build/$(policyeditor).bat $(DESTDIR)$(bindir)
 endif
+	${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/itweb-settings.bash $(BASH_CMPL_DEST_DIR)/
+	${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/javaws.bash $(BASH_CMPL_DEST_DIR)/
+	${INSTALL_DATA} $(TOP_BUILD_DIR)/completion/policyeditor.bash $(BASH_CMPL_DEST_DIR)/
 
 # all generated manpages are installed in swarm
 # all windows depndences are copied for windows build, and known one are copied/removed as necessary