diff options
| author | Andras Timar <andras.timar@collabora.com> | 2019-03-31 10:30:02 -0700 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-04-01 07:31:13 +0200 |
| commit | 62c9b13280e94103db6f83485d4bfe6993b1cd9f (patch) | |
| tree | a23a3b3b2195462bfb98fc3fb3cb533531cf60a2 /readlicense_oo | |
| parent | 8c4ba30663e2a8fe5abde7abc6c29e881f9a1a4f (diff) | |
[cp] MSP does not allow to move files between components
Change-Id: Ie279b16b4ba5dd87498f4144146d1a9e8ca4ece9
Reviewed-on: https://gerrit.libreoffice.org/70013
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'readlicense_oo')
| -rw-r--r-- | readlicense_oo/CustomTarget_license.mk | 4 | ||||
| -rw-r--r-- | readlicense_oo/Package_files.mk | 5 | ||||
| -rw-r--r-- | readlicense_oo/Package_license.mk | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/readlicense_oo/CustomTarget_license.mk b/readlicense_oo/CustomTarget_license.mk index 75923d109970..d5ecffb2300e 100644 --- a/readlicense_oo/CustomTarget_license.mk +++ b/readlicense_oo/CustomTarget_license.mk @@ -64,6 +64,10 @@ $(readlicense_oo_DIR)/license.txt : \ $(call gb_Helper_abbreviate_dirs, \ $(gb_AWK) 'sub("$$","\r")' $< > $@.tmp && mv $@.tmp $@ \ ) + +$(SRCDIR)/readlicense_oo/license/LICENSE.html: \ + $(readlicense_oo_DIR)/license.html + cp $< $@ endif # vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk index 95614109e3d1..41b6e43c4856 100644 --- a/readlicense_oo/Package_files.mk +++ b/readlicense_oo/Package_files.mk @@ -21,4 +21,9 @@ $(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/EULA_en-US.rtf, $(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt)) endif +ifeq ($(OS),WNT) +$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.fodt,LICENSE.html)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html)) +endif + # vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk index d91a18bb8bb5..1aaee1df4a47 100644 --- a/readlicense_oo/Package_license.mk +++ b/readlicense_oo/Package_license.mk @@ -11,7 +11,6 @@ $(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_g ifeq ($(OS),WNT) $(eval $(call gb_Package_add_file,readlicense_oo_license,license.txt,license.txt)) -$(eval $(call gb_Package_add_file,readlicense_oo_license,LICENSE.fodt,license.html)) else ifneq ($(OS),MACOSX) $(eval $(call gb_Package_add_file,readlicense_oo_license,LICENSE,LICENSE)) @@ -20,10 +19,12 @@ $(eval $(call gb_Package_add_file,readlicense_oo_license,Resources/LICENSE,LICEN endif endif +ifneq ($(OS),WNT) ifneq ($(OS),MACOSX) $(eval $(call gb_Package_add_file,readlicense_oo_license,LICENSE.html,license.html)) else $(eval $(call gb_Package_add_file,readlicense_oo_license,Resources/LICENSE.html,license.html)) endif +endif # vim: set noet sw=4 ts=4: |