diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:04:15 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-20 20:59:17 +0200 |
| commit | 5ac6c4818aa533746c84c1a42fb07b82bc7ec713 (patch) | |
| tree | e8fa3df031fa33a9b50458b759a5938853b625b0 /solenv | |
| parent | 53fd7e8690fa5c545da674d562da7ea8f2b686c0 (diff) | |
scp2: move postgresqlsdbc libraries to AutoInstall
Change-Id: Ia96e85191d877ebfd7621f7aa572f29e6482716c
Diffstat (limited to 'solenv')
| -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 60e628fedc70..4b8b59f159e1 100644 --- a/solenv/gbuild/AutoInstall.mk +++ b/solenv/gbuild/AutoInstall.mk @@ -12,7 +12,7 @@ define gb_AutoInstall__make_define echo "#define auto_$*_ALL \ " >> $@ $(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo " $(subst .,_,$(subst -,_,$(binary))), \ " >> $@;) -echo " $(lastword $(1))" >> $@; +echo " $(subst .,_,$(subst -,_,$(lastword $(1))))" >> $@; echo "" >> $@ endef @@ -26,7 +26,7 @@ $(file >>$@,\ endef define gb_AutoInstall__gen_lib -$(SCP2LIBTEMPLATE)(auto_$*_lib_$(1),$(call gb_Library_get_runtime_filename,$(1))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION))) +$(SCP2LIBTEMPLATE)(auto_$*_lib_$(subst .,_,$(subst -,_,$(1))),$(call gb_Library_get_runtime_filename,$(1))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION))) endef @@ -46,7 +46,7 @@ ifeq ($(HAVE_GNUMAKE_FILE_FUNC),) $(foreach jar,$(gb_Jar_MODULE_$*),auto_$*_jar_$(jar)) \ $(foreach pkg,$(gb_Package_MODULE_$*),auto_$*_pkg_$(pkg))) $(foreach lib,$(gb_Library_MODULE_$*),\ - echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) + echo '$(SCP2LIBTEMPLATE)(auto_$*_lib_$(subst .,_,$(subst -,_,$(lib))),$(call gb_Library_get_runtime_filename,$(lib))$(if $(SCP2COMPONENTCONDITION),$(COMMA)$(SCP2COMPONENTCONDITION)))' >> $@;) else $(file >$@,/* autogenerated installs for group $* */) $(call gb_AutoInstall__gen_define,\ |