diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-12-12 01:07:09 +0200 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2012-12-25 17:53:25 +0000 |
| commit | c29098917a1118d4b435df2b5f542adc8505e123 (patch) | |
| tree | f9407e3cf21b49abb40d536f73364abbddcb5ea3 /readlicense_oo | |
| parent | e5ccda4bb32eef8cab99c4d43c1571ec4bad3980 (diff) | |
Get rid of (most uses of) GUI
GUI only takes values UNX or WNT, so it is fairly pointless. One can check
whether OS is WNT or not instead.
Change-Id: I78ae32c03536a496a563e5deeb0fca78aebf9c34
Reviewed-on: https://gerrit.libreoffice.org/1304
Reviewed-by: Peter Foley <pefoley2@verizon.net>
Tested-by: Peter Foley <pefoley2@verizon.net>
Diffstat (limited to 'readlicense_oo')
| -rw-r--r-- | readlicense_oo/CustomTarget_readme.mk | 4 | ||||
| -rw-r--r-- | readlicense_oo/Package_readme.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk index 2f2ddda88789..343823d5b2f1 100644 --- a/readlicense_oo/CustomTarget_readme.mk +++ b/readlicense_oo/CustomTarget_readme.mk @@ -15,7 +15,7 @@ readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/readme) # what we need here is: gb_WITH_LANG_OR_DEFAULT ;-) readlicense_oo_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG)) -ifeq ($(GUI),UNX) +ifneq ($(OS),WNT) readlicense_oo_READMEs := $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/README_$(lang)) readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/README_% else @@ -68,7 +68,7 @@ $(readlicense_oo_README_PATTERN) : \ --stringparam type text \ $< \ $(readlicense_oo_README_XRM) && \ - $(if $(filter WNT,$(GUI)) \ + $(if $(filter WNT,$(OS)) \ ,$(gb_AWK) 'sub("$$","\r")' $@.out > $@.tmp && \ mv $@.tmp $@ && \ rm $@.out \ diff --git a/readlicense_oo/Package_readme.mk b/readlicense_oo/Package_readme.mk index e1fabb2a5b1e..d0e86dd78bae 100644 --- a/readlicense_oo/Package_readme.mk +++ b/readlicense_oo/Package_readme.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,readlicense_oo_readme_inc,$(call gb_CustomTarge $(eval $(call gb_Package_add_files,readlicense_oo_readme_inc,bin/osl,\ $(foreach lang,en-US $(filter-out en-US,$(gb_WITH_LANG)),\ - $(if $(filter UNX,$(GUI)),README_$(lang),readme_$(lang).txt) \ + $(if $(filter-out WNT,$(OS)),README_$(lang),readme_$(lang).txt) \ ) \ )) |