diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-06-15 17:04:07 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-15 17:12:29 +0100 |
| commit | 1a038dc88b19ee601f411d5847ee74751b08c476 (patch) | |
| tree | fd15a74bb6b410c3d65d06074e5376143fe8b88b /instsetoo_native/CustomTarget_install.mk | |
| parent | d53ad9250d77f89a2a7d260a98090a8504c12108 (diff) | |
alternative solution to avoid adding a gnome-vfs dependency if disabled
i.e. "don't add gnomevfs requires to epm created rpms if GNOMEVFS is disabled"
seeing as setup_native/source/packinfo/packinfo_office.txt references
find-requires-gnome.sh and doesn't have conditional support revert the split
and put the the conditional into find-requires-gnome.sh
Change-Id: I34bd37c4fd252f2175ff055024293dea946b4881
Diffstat (limited to 'instsetoo_native/CustomTarget_install.mk')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 101160ca7371..f894ae547732 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -21,8 +21,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/install)) $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\ install.phony \ $(if $(filter-out WNT,$(OS)),\ - $(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \ - bin/find-requires-glib.sh \ + bin/find-requires-gnome.sh \ bin/find-requires-x11.sh) \ $(foreach ulf,$(instsetoo_ULFLIST),win_ulffiles/$(ulf).ulf) \ )) @@ -32,8 +31,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \ $(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \ $(if $(filter-out WNT,$(OS)),\ $(addprefix $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/,\ - $(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \ - bin/find-requires-glib.sh \ + bin/find-requires-gnome.sh \ bin/find-requires-x11.sh) \ ) \ $(call gb_Postprocess_get_target,AllModulesButInstsetNative) |