8 files changed, 61 insertions, 19 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index 68c26e5cb1c9..ee693ff13d05 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -38,6 +38,8 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(call gb_Package_get_target,odk_html) \
 		$(call gb_Package_get_target,odk_lib) \
 		$(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \
+		$(call gb_Package_get_target,odk_settings) \
+		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \
 		$(call gb_CustomTarget_get_target,odk/odkcommon)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1)
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 246247a5bb28..6b500e86fb14 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -17,7 +17,6 @@ $(call gb_CustomTarget_get_target,odk/odkcommon): \
 	$(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp/ref)) \
 	$(if $(SOLAR_JAVA),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/java/ref)) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/docs/common/ref) \
-	$(call gb_CustomTarget_get_target,odk/odkcommon/settings) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/classes) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/idl) \
 	$(call gb_CustomTarget_get_target,odk/odkcommon/include)
diff --git a/odk/CustomTarget_settings.mk b/odk/CustomTarget_settings.mk
index 358561b99c22..581d522e01fb 100644
--- a/odk/CustomTarget_settings.mk
+++ b/odk/CustomTarget_settings.mk
@@ -9,25 +9,9 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/settings))
 
-odk_SETTINGSLIST := settings.mk \
-	std.mk \
-	stdtarget.mk \
-	$(if $(filter WNT,$(OS)),component.uno.def)
-
-define odk_settings
-odkcommon_ZIPLIST += settings/$(1)
-$(call gb_CustomTarget_get_target,odk/odkcommon/settings): $(odk_WORKDIR)/settings/$(1)
-$(odk_WORKDIR)/settings/$(1): $(SRCDIR)/odk/settings/$(1)
-	mkdir -p $$(dir $$@)
-	$$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
-	cp $$< $$@
-endef
-
-$(foreach setting,$(odk_SETTINGSLIST),$(eval $(call odk_settings,$(setting))))
-
-odkcommon_ZIPLIST += settings/dk.mk
 $(eval $(call gb_CustomTarget_register_target,odk/odkcommon/settings,dk.mk))
-$(odk_WORKDIR)/settings/dk.mk: $(SRCDIR)/odk/pack/copying/dk.mk
+
+$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)/dk.mk : $(SRCDIR)/odk/pack/copying/dk.mk
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,SED,1)
 	tr -d "\015" < $< | sed -e 's/@@RELEASE@@/$(PRODUCTVERSION)/' \
 		-e 's/@@BUILDID@@/$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)/' \
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 6a51a13f9c49..36eacef5ee3f 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -24,6 +24,8 @@ $(eval $(call gb_Module_add_targets,odk,\
 	Package_html \
 	Package_examples \
 	Package_lib \
+	Package_settings \
+	Package_settings_generated \
 ))
 
 ifeq ($(OS),WNT)
diff --git a/odk/Package_settings.mk b/odk/Package_settings.mk
new file mode 100644
index 000000000000..ff01fd29871e
--- /dev/null
+++ b/odk/Package_settings.mk
@@ -0,0 +1,21 @@
+# -*- 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,odk_settings,$(SRCDIR)/odk/settings))
+
+$(eval $(call gb_Package_set_outdir,odk_settings,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_settings,$(gb_Package_SDKDIRNAME)/settings,\
+	$(if $(filter WNT,$(OS)),component.uno.def) \
+	settings.mk \
+	std.mk \
+	stdtarget.mk \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/odk/Package_settings_generated.mk b/odk/Package_settings_generated.mk
new file mode 100644
index 000000000000..3813d9899e34
--- /dev/null
+++ b/odk/Package_settings_generated.mk
@@ -0,0 +1,18 @@
+# -*- 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,odk_settings_generated,$(call gb_CustomTarget_get_workdir,odk/odkcommon/settings)))
+
+$(eval $(call gb_Package_set_outdir,odk_settings_generated,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_settings_generated,$(gb_Package_SDKDIRNAME)/settings,\
+	dk.mk \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp
index 10edb7287006..2c965ea1142e 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -43,6 +43,8 @@ Module gid_Module_Optional_Sdkoo
         gid_File_Package_odk_html,
         gid_File_Package_odk_lib,
         gid_File_Package_odk_macosx,
+        gid_File_Package_odk_settings,
+        gid_File_Package_odk_settings_generated,
         gid_File_Package_odk_unowinreg,
         gid_File_Zip_Odkexamples,
         gid_File_Zip_Odkcommon,
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index a29c8fcccd43..69b6fd8564fe 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -185,6 +185,20 @@ File gid_File_Package_odk_macosx
 End
 #endif
 
+File gid_File_Package_odk_settings
+    TXT_FILE_BODY;
+    Dir = FILELIST_SDK_DIR;
+    Name = "odk_settings.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End
+
+File gid_File_Package_odk_settings_generated
+    TXT_FILE_BODY;
+    Dir = FILELIST_SDK_DIR;
+    Name = "odk_settings_generated.filelist";
+    Styles = (FILELIST,USE_INTERNAL_RIGHTS);
+End
+
 #if defined(SOLAR_JAVA)
 File gid_File_Package_odk_unowinreg
     TXT_FILE_BODY;