diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-18 21:53:18 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-18 22:18:11 +0100 |
| commit | 7b56d303300fbf592473b28b654fd22fec110962 (patch) | |
| tree | 617d7f2287de765357125d600023d87a94b95db5 /solenv/gbuild/AutoInstall.mk | |
| parent | scp2: move rhino to AutoInstall (diff) | |
| download | core-7b56d303300fbf592473b28b654fd22fec110962.tar.gz core-7b56d303300fbf592473b28b654fd22fec110962.zip | |
gbuild: AutoInstall: substitute "." in jar names
Change-Id: Icdb628164c53d212871171ab7dea2617f79a7a36
Diffstat (limited to 'solenv/gbuild/AutoInstall.mk')
| -rw-r--r-- | solenv/gbuild/AutoInstall.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index d8daec8bb62a..c25c9352bf74 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -11,7 +11,7 @@ define gb_AutoInstall__make_define echo "#define auto_$*_ALL \ " >> $@ -$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo " $(subst -,_,$(binary)), \ " >> $@;) +$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo " $(subst .,_,$(subst -,_,$(binary))), \ " >> $@;) echo " $(lastword $(1))" >> $@; echo "" >> $@ endef @@ -34,9 +34,9 @@ $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \ $(foreach lib,$(gb_SdkLinkLibrary_MODULE_$*),\ echo 'SDK_LIBRARY_LINK(auto_$*_link_$(lib),$(notdir $(call gb_Library_get_sdk_link_lib,$(lib))),../../ure-link/lib/$(call gb_Library_get_runtime_filename,$(lib)))' >> $@;) $(foreach exe,$(gb_Executable_MODULE_$*),\ - echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst -,_,$(exe)),$(call gb_Executable_get_filename,$(exe)))" >> $@;) + echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst .,_,$(subst -,_,$(exe))),$(call gb_Executable_get_filename,$(exe)))" >> $@;) $(foreach jar,$(gb_Jar_MODULE_$*),\ - echo '$(SCP2JARTEMPLATE)(auto_$*_jar_$(subst -,_,$(jar)),$(jar).jar)' >> $@;) + echo '$(SCP2JARTEMPLATE)(auto_$*_jar_$(subst .,_,$(subst -,_,$(jar))),$(jar).jar)' >> $@;) $(foreach pkg,$(gb_Package_MODULE_$*),\ echo 'PACKAGE_FILELIST(auto_$*_pkg_$(subst -,_,$(pkg)),$(pkg).filelist)' >> $@;) |