diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-06-10 10:37:19 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-10 11:05:07 +0100 |
| commit | bb42b693c81814a966723b5067a2d20754fe82e0 (patch) | |
| tree | b17e6b379be56b1a298230cf7aab7be77cdacc7b /instsetoo_native/CustomTarget_install.mk | |
| parent | 371cc81bd9ccbfbed25f810e70899c044280349e (diff) | |
don't add gnomevfs requires to epm created rpms if GNOMEVFS is disabled
Change-Id: I689783e176921ea03475d3e113426563bf20b9d7
Diffstat (limited to 'instsetoo_native/CustomTarget_install.mk')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index f894ae547732..101160ca7371 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -21,7 +21,8 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/install)) $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\ install.phony \ $(if $(filter-out WNT,$(OS)),\ - bin/find-requires-gnome.sh \ + $(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \ + bin/find-requires-glib.sh \ bin/find-requires-x11.sh) \ $(foreach ulf,$(instsetoo_ULFLIST),win_ulffiles/$(ulf).ulf) \ )) @@ -31,7 +32,8 @@ $(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)/,\ - bin/find-requires-gnome.sh \ + $(if $(ENABLE_GNOMEVFS),bin/find-requires-gnomevfs.sh) \ + bin/find-requires-glib.sh \ bin/find-requires-x11.sh) \ ) \ $(call gb_Postprocess_get_target,AllModulesButInstsetNative) |