diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-07 12:58:33 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-08 04:03:31 -0600 |
| commit | 7b3133ad882b24834f87b478d00bf4ee92d3cd63 (patch) | |
| tree | e0eb51389ad9e3395775e918a8b962e3b6c2170f /readlicense_oo | |
| parent | 2203611500f1fdeb63ed1fd1dfedbdb11dec968e (diff) | |
instsetoo_native: shouldn't need instdir in include path
get_Source_Directory_For_Files_From_Includepathlist already
has a special hack to find all the files in instdir so ideally it should
not be necessary to put these directories on the include path.
Clean up readlicense_oo to make that possible; also copying license.txt
as-is to LICENSE on Unix but first converting it on WNT is rather silly...
Change-Id: I95f30bc5e0b7ca73c50156a7ce0131640185778c
Reviewed-on: https://gerrit.libreoffice.org/6613
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'readlicense_oo')
| -rw-r--r-- | readlicense_oo/CustomTarget_license.mk | 2 | ||||
| -rw-r--r-- | readlicense_oo/Package_files.mk | 16 | ||||
| -rw-r--r-- | readlicense_oo/license/CREDITS.odt (renamed from readlicense_oo/odt/CREDITS.odt) | bin | 65605 -> 65605 bytes | |||
| -rw-r--r-- | readlicense_oo/license/LICENSE (renamed from readlicense_oo/txt/license.txt) | 0 | ||||
| -rw-r--r-- | readlicense_oo/license/LICENSE.html (renamed from readlicense_oo/html/LICENSE.html) | 0 | ||||
| -rw-r--r-- | readlicense_oo/license/LICENSE.odt (renamed from readlicense_oo/odt/LICENSE.odt) | bin | 141186 -> 141186 bytes | |||
| -rw-r--r-- | readlicense_oo/license/NOTICE (renamed from readlicense_oo/txt/NOTICE) | 0 |
7 files changed, 10 insertions, 8 deletions
diff --git a/readlicense_oo/CustomTarget_license.mk b/readlicense_oo/CustomTarget_license.mk index f6647efa1439..653f1dd38541 100644 --- a/readlicense_oo/CustomTarget_license.mk +++ b/readlicense_oo/CustomTarget_license.mk @@ -14,7 +14,7 @@ readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/license) $(call gb_CustomTarget_get_target,readlicense_oo/license) : $(readlicense_oo_DIR)/license.txt $(readlicense_oo_DIR)/license.txt : \ - $(SRCDIR)/readlicense_oo/txt/license.txt \ + $(SRCDIR)/readlicense_oo/license/LICENSE \ | $(readlicense_oo_DIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,1) $(call gb_Helper_abbreviate_dirs, \ diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk index 74fac2759b56..2c0d6d619afd 100644 --- a/readlicense_oo/Package_files.mk +++ b/readlicense_oo/Package_files.mk @@ -7,17 +7,19 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo)) +$(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo/license)) -# LICENSE (upper case) is copied without EOL conversion from license.txt +# LICENSE (upper case) is copied without EOL conversion # license.txt is converted, prior to copy, see Package_license.mk -$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,txt/license.txt)) +ifneq ($(OS),WNT) +$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,LICENSE)) +endif -$(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,txt/NOTICE)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE)) -$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.odt,odt/LICENSE.odt)) -$(eval $(call gb_Package_add_file,readlicense_oo_files,CREDITS.odt,odt/CREDITS.odt)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.odt,LICENSE.odt)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,CREDITS.odt,CREDITS.odt)) -$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.html,html/LICENSE.html)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html)) # vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/odt/CREDITS.odt b/readlicense_oo/license/CREDITS.odt Binary files differindex 2fae5541a03b..2fae5541a03b 100644 --- a/readlicense_oo/odt/CREDITS.odt +++ b/readlicense_oo/license/CREDITS.odt diff --git a/readlicense_oo/txt/license.txt b/readlicense_oo/license/LICENSE index 0a08db1e6e2b..0a08db1e6e2b 100644 --- a/readlicense_oo/txt/license.txt +++ b/readlicense_oo/license/LICENSE diff --git a/readlicense_oo/html/LICENSE.html b/readlicense_oo/license/LICENSE.html index e77c6c4f41a0..e77c6c4f41a0 100644 --- a/readlicense_oo/html/LICENSE.html +++ b/readlicense_oo/license/LICENSE.html diff --git a/readlicense_oo/odt/LICENSE.odt b/readlicense_oo/license/LICENSE.odt Binary files differindex c2d49063f4bb..c2d49063f4bb 100644 --- a/readlicense_oo/odt/LICENSE.odt +++ b/readlicense_oo/license/LICENSE.odt diff --git a/readlicense_oo/txt/NOTICE b/readlicense_oo/license/NOTICE index 0a4bc388c2dd..0a4bc388c2dd 100644 --- a/readlicense_oo/txt/NOTICE +++ b/readlicense_oo/license/NOTICE |