diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-19 00:06:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-22 11:08:31 +0200 |
| commit | 5e300e9030d8d0730223b1eea1627953524cb58c (patch) | |
| tree | 561bc85514f044fc05dee7c9dfce3617516c2c77 /solenv | |
| parent | def1a59d18b8cb1bf351ae83f2f11acbe41a8229 (diff) | |
odk: remove Package_bin, instead auto-install executables
This is somewhat annoying since it requires re-introducing stupid
directories in scp2, but if the executables should be put in INSTDIR
directly then the Package_bin needs to go.
Change-Id: I893694c7f9d4cb5b9ef8ec4a3d30e08536223740
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AutoInstall.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/Executable.mk | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk index 6494c642e096..de94507065c6 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 " $(binary), \ " >> $@;) +$(foreach binary,$(filter-out $(lastword $(1)),$(1)),echo " $(subst -,_,$(binary)), \ " >> $@;) echo " $(lastword $(1))" >> $@; echo "" >> $@ endef @@ -28,7 +28,7 @@ $(call gb_AutoInstall_get_target,%) : $(SRCDIR)/Repository.mk $(GBUILDDIR)/AutoI $(foreach lib,$(gb_Library_MODULE_$*),\ echo "$(SCP2LIBTEMPLATE)(auto_$*_lib_$(lib),$(call gb_Library_get_runtime_filename,$(lib)))" >> $@;) $(foreach exe,$(gb_Executable_MODULE_$*),\ - echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(exe),$(call gb_Executable_get_filename,$(exe)))" >> $@;) + echo "$(SCP2EXETEMPLATE)(auto_$*_exe_$(subst -,_,$(exe)),$(call gb_Executable_get_filename,$(exe)))" >> $@;) $(call gb_AutoInstall_get_clean_target,%) : diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index ca70437168b7..c12287b5c14f 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -22,10 +22,10 @@ # defined by platform # gb_Executable_Executable_platform -# NOTE: SDKBIN executables are already packaged in module odk gb_Executable_LAYER_DIRS := \ - OOO:$(gb_PROGRAMDIRNAME) \ - UREBIN:$(LIBO_URE_BIN_FOLDER) \ + UREBIN:$(gb_INSTROOT)/$(LIBO_URE_BIN_FOLDER) \ + OOO:$(gb_INSTROOT)/$(gb_PROGRAMDIRNAME) \ + SDKBIN:$(INSTDIR)/$(gb_Package_SDKDIRNAME)/bin \ $(dir $(call gb_Executable_get_runtime_target,%)).dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) @@ -43,7 +43,7 @@ $(call gb_Executable_get_clean_target,%) : $(call gb_Executable_get_runtime_target,$*) \ $(AUXTARGETS)) -gb_Executable__get_dir_for_layer = $(patsubst $(1):%,$(gb_INSTROOT)/%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS))) +gb_Executable__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS))) gb_Executable__get_dir_for_exe = $(call gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1))) gb_Executable_get_install_target = $(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1)) |