install whole sdk using filelists

Change-Id: I9d8d0a20d776740c4701ec9a1facded9f4bde77a

4 files changed, 19 insertions, 21 deletions

diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk
index 13b731ef340f..a16beccf3580 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -15,15 +15,8 @@ readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/readme)
 # what we need here is: gb_WITH_LANG_OR_DEFAULT ;-)
 readlicense_oo_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
 
-ifneq ($(OS),WNT)
-readlicense_oo_READMEs := $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/README_$(lang))
-readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/README_%
-else
-readlicense_oo_READMEs := $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/readme_$(lang).txt)
-readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/readme_%.txt
-endif
-
-$(call gb_CustomTarget_get_target,readlicense_oo/readme) : $(readlicense_oo_READMEs)
+$(call gb_CustomTarget_get_target,readlicense_oo/readme) : \
+	$(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/$(call gb_README,$(lang)))
 
 ifeq ($(strip $(gb_WITH_LANG)),)
 readlicense_oo_README_XRM := $(SRCDIR)/readlicense_oo/docs/readme.xrm
@@ -48,7 +41,11 @@ $(readlicense_oo_DIR)/readme.xrm : \
 
 endif
 
-$(readlicense_oo_README_PATTERN) : \
+readlicense_oo_README_SED := \
+	-e 's,$${PRODUCTNAME},LibreOffice,g' \
+	-e 's,$${PRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR),g' \
+
+$(readlicense_oo_DIR)/$(call gb_README,%) : \
 		$(SRCDIR)/readlicense_oo/docs/readme.xsl \
 		$(readlicense_oo_README_XRM) \
 		| $(readlicense_oo_DIR)/.dir \
@@ -62,13 +59,13 @@ $(readlicense_oo_README_PATTERN) : \
 			--stringparam os1 $(OS) \
 			--stringparam type text \
 			$< \
-			$(readlicense_oo_README_XRM) && \
-		$(if $(filter WNT,$(OS)) \
-			,$(gb_AWK) 'sub("$$","\r")' $@.out > $@.tmp && \
-				mv $@.tmp $@ && \
-				rm $@.out \
-			,mv $@.out $@ \
+			$(readlicense_oo_README_XRM) \
+		$(if $(filter WNT,$(OS)), \
+			&& $(gb_AWK) 'sub("$$","\r")' $@.out > $@.tmp \
+			&& mv $@.tmp $@.out \
 		) \
+		&& sed $(readlicense_oo_README_SED) $@.out > $@ \
+		&& rm $@.out \
 	)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/readlicense_oo/Module_readlicense_oo.mk b/readlicense_oo/Module_readlicense_oo.mk
index 6cd804e1f860..89f5ae3feff6 100644
--- a/readlicense_oo/Module_readlicense_oo.mk
+++ b/readlicense_oo/Module_readlicense_oo.mk
@@ -10,12 +10,15 @@
 $(eval $(call gb_Module_Module,readlicense_oo))
 
 $(eval $(call gb_Module_add_targets,readlicense_oo,\
-    CustomTarget_license \
     CustomTarget_readme \
     Package_files \
-    Package_license \
     Package_readme \
 ))
-
+ifeq (WNT,$(OS))
+$(eval $(call gb_Module_add_targets,readlicense_oo,\
+    CustomTarget_license \
+    Package_license \
+))
+endif
 
 # vim:set noet sw=4 ts=4:
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index f3f146b7f7a2..ad35b593bac3 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo))
 # 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,bin/ure/LICENSE,txt/license.txt))
 
 $(eval $(call gb_Package_add_file,readlicense_oo_files,bin/NOTICE,txt/NOTICE))
 
diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk
index cdc3b15dc758..9b460d94f8fb 100644
--- a/readlicense_oo/Package_license.mk
+++ b/readlicense_oo/Package_license.mk
@@ -10,6 +10,5 @@
 $(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_get_workdir,readlicense_oo/license)))
 
 $(eval $(call gb_Package_add_file,readlicense_oo_license,bin/osl/license.txt,license.txt))
-$(eval $(call gb_Package_add_file,readlicense_oo_license,bin/ure/license.txt,license.txt))
 
 # vim: set noet sw=4 ts=4: