readlicense_oo: stop delivering files to OUTDIR

- remove Package_readme, use generated files from WORKDIR via include
path
- Package_license and Package_files deliver to INSTDIR
- split up Package_odk_shared_readme to have extra Package for
generated files
- gb_Extension_LICENSEFILE_DEFAULT points to INSTDIR

Change-Id: I019d3431e30d982e887ae0000c755e0d61f98893

4 files changed, 7 insertions, 32 deletions

diff --git a/readlicense_oo/Module_readlicense_oo.mk b/readlicense_oo/Module_readlicense_oo.mk
index 89f5ae3feff6..3170e138aba5 100644
--- a/readlicense_oo/Module_readlicense_oo.mk
+++ b/readlicense_oo/Module_readlicense_oo.mk
@@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,readlicense_oo))
 $(eval $(call gb_Module_add_targets,readlicense_oo,\
     CustomTarget_readme \
     Package_files \
-    Package_readme \
 ))
+
 ifeq (WNT,$(OS))
 $(eval $(call gb_Module_add_targets,readlicense_oo,\
     CustomTarget_license \
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 19cf8fd68c29..74fac2759b56 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -9,18 +9,15 @@
 
 $(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo))
 
-$(eval $(call gb_Package_set_outdir,readlicense_oo_files,$(OUTDIR)))
-
 # LICENSE (upper case) is copied without EOL conversion from license.txt
 # license.txt is converted, prior to copy, see Package_license.mk
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE,txt/license.txt))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,txt/license.txt))
 
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/NOTICE,txt/NOTICE))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,txt/NOTICE))
 
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE.odt,odt/LICENSE.odt))
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.odt,odt/LICENSE.odt))
-$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/CREDITS.odt,odt/CREDITS.odt))
+$(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,bin/LICENSE.html,html/LICENSE.html))
+$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.html,html/LICENSE.html))
 
 # vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk
index 877db2303a6b..7dd1d8c148c3 100644
--- a/readlicense_oo/Package_license.mk
+++ b/readlicense_oo/Package_license.mk
@@ -9,8 +9,6 @@
 
 $(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_get_workdir,readlicense_oo/license)))
 
-$(eval $(call gb_Package_set_outdir,readlicense_oo_license,$(OUTDIR)))
-
-$(eval $(call gb_Package_add_file,readlicense_oo_license,bin/osl/license.txt,license.txt))
+$(eval $(call gb_Package_add_file,readlicense_oo_license,license.txt,license.txt))
 
 # vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/Package_readme.mk b/readlicense_oo/Package_readme.mk
deleted file mode 100644
index 1e30ba364709..000000000000
--- a/readlicense_oo/Package_readme.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,readlicense_oo_readme_inc,$(call gb_CustomTarget_get_workdir,readlicense_oo/readme)))
-
-$(eval $(call gb_Package_set_outdir,readlicense_oo_readme_inc,$(OUTDIR)))
-
-$(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-out WNT,$(OS)),README_$(lang),readme_$(lang).txt) \
-	) \
-))
-
-# vim: set noet sw=4 ts=4: