From fa424af27e8fd00528aea6ae4377184557a3a160 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 30 Oct 2013 21:28:09 +0100 Subject: 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 --- readlicense_oo/Package_files.mk | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'readlicense_oo/Package_files.mk') 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: -- cgit