Mercurial > hg > release > icedtea-web-1.7
changeset 1419:c354ddd6de5f
PR3366 - Install bash completion to configured dynamic load location (3/4)
* Makefile.am: BASH_CMPL_DEST_DIR subsituted from bashcompdir
* configure.ac: added PKG_CHECK_VAR on bashcompdir and bash-completion
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Wed, 10 May 2017 12:41:53 +0200 |
| parents | 13cf373ecdba |
| children | 90c27b3bf5a6 |
| files | ChangeLog Makefile.am configure.ac |
| diffstat | 3 files changed, 12 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 04 16:13:43 2017 +0200 +++ b/ChangeLog Wed May 10 12:41:53 2017 +0200 @@ -1,3 +1,10 @@ +2017-05-10 Jiri Vanek <jvanek@redhat.com> + Ville Skyttä <ville.skytta@iki.fi> + + PR3366 - Install bash completion to configured dynamic load location (3/4) + * Makefile.am: BASH_CMPL_DEST_DIR subsituted from bashcompdir + * configure.ac: added PKG_CHECK_VAR on bashcompdir and bash-completion + 2017-05-04 Jiri Vanek <jvanek@redhat.com> * Makefile: (stamps/run-netx-unit-tests.stamp) variable CLASSPATH's content
--- a/Makefile.am Thu May 04 16:13:43 2017 +0200 +++ b/Makefile.am Wed May 10 12:41:53 2017 +0200 @@ -34,7 +34,7 @@ export NETX_SRCDIR = $(TOP_SRC_DIR)/netx export NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources export ICONS_DEST_DIR=$(DESTDIR)$(datadir)/pixmaps -export BASH_CMPL_DEST_DIR=$(DESTDIR)$(sysconfdir)/bash_completion.d +export BASH_CMPL_DEST_DIR=$(DESTDIR)@bashcompdir@ export WIN_ALL_DEPS=$(DESTDIR)$(prefix)/win-deps-all export WIN_RUN_DEPS=$(DESTDIR)$(prefix)/win-deps-runtime
--- a/configure.ac Thu May 04 16:13:43 2017 +0200 +++ b/configure.ac Wed May 10 12:41:53 2017 +0200 @@ -157,6 +157,10 @@ IT_CHECK_FOR_TAGSOUP +PKG_CHECK_VAR(bashcompdir, [bash-completion], [completionsdir], , + bashcompdir="${sysconfdir}/bash_completion.d") +AC_SUBST(bashcompdir) + AC_CONFIG_FILES([jrunscript], [chmod u+x jrunscript]) AC_CONFIG_FILES([build.properties])