install SpotlightImporter bundle using filelists

Change-Id: I01ea506b76356ce62688350d096ff77c2cddcbdf

4 files changed, 38 insertions, 20 deletions

diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 060a2f1aa207..3ab07abe7be8 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -120,7 +120,8 @@ endif # ENABLE_NPAPI_INTO_BROWSER=YES
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_Module_add_targets,extensions,\
 	Library_OOoSpotlightImporter \
-	Zip_mdibundle \
+	Package_mdibundle \
+	Package_OOoSpotlightImporter \
 ))
 endif # OS=MACOSX
 
diff --git a/extensions/Package_OOoSpotlightImporter.mk b/extensions/Package_OOoSpotlightImporter.mk
new file mode 100644
index 000000000000..6cb662d24287
--- /dev/null
+++ b/extensions/Package_OOoSpotlightImporter.mk
@@ -0,0 +1,16 @@
+# -*- 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,extensions_OOoSpotlightImporter,$(OUTDIR)/lib))
+
+$(eval $(call gb_Package_set_outdir,extensions_OOoSpotlightImporter,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,extensions_OOoSpotlightImporter,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents/MacOS/OOoSpotlightImporter,$(call gb_Library_get_runtime_filename,OOoSpotlightImporter)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extensions/Package_mdibundle.mk b/extensions/Package_mdibundle.mk
new file mode 100644
index 000000000000..b8fc9a41306e
--- /dev/null
+++ b/extensions/Package_mdibundle.mk
@@ -0,0 +1,20 @@
+# -*- 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,extensions_mdibundle,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter))
+
+$(eval $(call gb_Package_set_outdir,extensions_mdibundle,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extensions_mdibundle,Library/Spotlight/OOoSpotlightImporter.mdimporter/Contents,\
+    Info.plist \
+    en.lproj/schema.strings \
+    schema.xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extensions/Zip_mdibundle.mk b/extensions/Zip_mdibundle.mk
deleted file mode 100644
index e6614c04b6c8..000000000000
--- a/extensions/Zip_mdibundle.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: makefile; 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_Zip_Zip,mdibundle,$(WORKDIR)/Zip/mdibundle))
-
-$(eval $(call gb_Zip_add_file,mdibundle,schema.xml,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/schema.xml))
-$(eval $(call gb_Zip_add_file,mdibundle,Info.plist,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/Info.plist))
-$(eval $(call gb_Zip_add_file,mdibundle,en.lproj/schema.strings,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/en.lproj/schema.strings))
-$(eval $(call gb_Zip_add_file,mdibundle,MacOS/OOoSpotlightImporter,$(OUTDIR)/lib/libOOoSpotlightImporter.dylib))
-
-# vim:set noet sw=4 ts=4: