Mercurial > hg > release > icedtea-web-1.7
changeset 1417:586e12244c40
Makefile: (install-data-local) when copying to WIN_RUN_DEPS, the name of resource is stripped to be versionless
| author | Jiri Vanek <jvanek@redhat.com> |
|---|---|
| date | Thu, 04 May 2017 14:49:13 +0200 |
| parents | 4f0d82b723ca |
| children | 13cf373ecdba |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu May 04 12:36:45 2017 +0200 +++ b/ChangeLog Thu May 04 14:49:13 2017 +0200 @@ -1,3 +1,8 @@ +2017-05-04 Jiri Vanek <jvanek@redhat.com> + + * Makefile: (install-data-local) when copying to WIN_RUN_DEPS, the name of + resource is stripped to be versionless + 2017-05-04 Jiri Vanek <jvanek@redhat.com> Adam Buchta <adbuch7@gmail.com>
--- a/Makefile.am Thu May 04 12:36:45 2017 +0200 +++ b/Makefile.am Thu May 04 14:49:13 2017 +0200 @@ -364,10 +364,12 @@ rm -v $(WIN_ALL_DEPS)/`basename $$JAR` ; \ done; if WITH_RHINO - cp -v $(RHINO_JAR) $(WIN_RUN_DEPS)/ + filteredName=`basename $(RHINO_JAR) | sed "s/[^a-zA-Z]//g" | sed "s/jar$$/.jar/"` ; \ + cp -v $(RHINO_JAR) $(WIN_RUN_DEPS)/$$filteredName endif if HAVE_TAGSOUP - cp -v $(TAGSOUP_JAR) $(WIN_RUN_DEPS)/ + filteredName=`basename $(TAGSOUP_JAR) | sed "s/[^a-zA-Z]//g" | sed "s/jar$$/.jar/"` ; \ + cp -v $(TAGSOUP_JAR) $(WIN_RUN_DEPS)/$$filteredName endif endif