diff options
| author | David Tardon <dtardon@redhat.com> | 2012-01-14 10:23:57 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-01-15 20:12:01 +0100 |
| commit | c475316c00056ab2c59438fb78705c2a851f292b (patch) | |
| tree | 74f9703b3a32157ddf88a432eb10973004fafbdf /desktop | |
| parent | do not build on macosx and win (diff) | |
| download | core-c475316c00056ab2c59438fb78705c2a851f292b.tar.gz core-c475316c00056ab2c59438fb78705c2a851f292b.zip | |
simplify handling of JITC_PROCESSOR_TYPE
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/Module_desktop.mk | 2 | ||||
| -rw-r--r-- | desktop/Package_scripts.mk | 8 | ||||
| -rw-r--r-- | desktop/scripts/Makefile | 6 |
3 files changed, 5 insertions, 11 deletions
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index ed2c1fe51799..17fe079cde37 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -71,14 +71,12 @@ $(eval $(call gb_Module_add_targets,desktop,\ ifneq ($(OS),MACOSX) ifneq ($(OS),WNT) -ifneq ($(JITC_PROCESSOR_TYPE_EXPORT),) $(eval $(call gb_Module_add_targets,desktop,\ Package_soffice_sh \ )) endif endif endif -endif ifeq ($(OS),WNT) diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk index 76117652a0c2..949230699107 100644 --- a/desktop/Package_scripts.mk +++ b/desktop/Package_scripts.mk @@ -46,14 +46,6 @@ $(eval $(call gb_Package_add_file,desktop_scripts,bin/swriter,swriter.sh)) $(eval $(call gb_Package_add_file,desktop_scripts,bin/unoinfo,unoinfo.sh)) $(eval $(call gb_Package_add_file,desktop_scripts,bin/unopkg,unopkg.sh)) -ifneq ($(OS),MACOSX) -ifeq ($(JITC_PROCESSOR_TYPE_EXPORT),) - -$(eval $(call gb_Package_add_file,desktop_scripts,bin/soffice,soffice.sh)) - -endif -endif - endif # vim: set ts=4 sw=4 et: diff --git a/desktop/scripts/Makefile b/desktop/scripts/Makefile index 349c5dd1c155..a654b6b22a6d 100644 --- a/desktop/scripts/Makefile +++ b/desktop/scripts/Makefile @@ -26,7 +26,11 @@ # instead of those above. soffice.sh : $(SRCDIR)/desktop/scripts/soffice.sh - sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/$(JITC_PROCESSOR_TYPE_EXPORT)/" $< > $@ +ifneq ($(JITC_PROCESSOR_TYPE),) + sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@ +else + cp $< $@ +endif .DEFAULT_GOAL := all .PHONY : all |