From 7b3133ad882b24834f87b478d00bf4ee92d3cd63 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Thu, 7 Nov 2013 12:58:33 +0100 Subject: 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 Reviewed-by: Michael Stahl --- odk/Package_share_readme.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'odk/Package_share_readme.mk') diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk index a73d1e9170ca..558bdd5cb84d 100644 --- a/odk/Package_share_readme.mk +++ b/odk/Package_share_readme.mk @@ -12,12 +12,12 @@ $(eval $(call gb_Package_Package,odk_share_readme,$(SRCDIR))) $(eval $(call gb_Package_set_outdir,odk_share_readme,$(INSTDIR))) $(eval $(call gb_Package_add_files,odk_share_readme,$(SDKDIRNAME)/share/readme,\ - readlicense_oo/html/LICENSE.html \ + readlicense_oo/license/LICENSE.html \ )) +# for WNT see Package_share_readme_generated.mk ifneq ($(OS),WNT) -# the stupid thing is renamed, see Package_files.mk -$(eval $(call gb_Package_add_file,odk_share_readme,$(SDKDIRNAME)/share/readme/LICENSE,readlicense_oo/txt/license.txt)) +$(eval $(call gb_Package_add_file,odk_share_readme,$(SDKDIRNAME)/share/readme/LICENSE,readlicense_oo/license/LICENSE)) endif # vim: set noet sw=4 ts=4: -- cgit