[PATCH] fdo#63197: convert psprint_config files

[Julien Nabet (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3442

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/42/3442/1

fdo#63197: convert psprint_config files

Change-Id: I8e3046a6ed30ac8ee60940844b8ceda6ec1ffd39
---
M psprint_config/Module_psprint_config.mk
R psprint_config/Package_fontunxppds.mk
R psprint_config/Package_fontunxpsprint.mk
3 files changed, 10 insertions(+), 6 deletions(-)



diff --git a/psprint_config/Module_psprint_config.mk b/psprint_config/Module_psprint_config.mk
index 5c30c9f..0d35eb0 100644
--- a/psprint_config/Module_psprint_config.mk
+++ b/psprint_config/Module_psprint_config.mk
@@ -28,8 +28,8 @@
 $(eval $(call gb_Module_Module,psprint_config))
 
 $(eval $(call gb_Module_add_targets,psprint_config,\
-	Zip_fontunxppds \
-	Zip_fontunxpsprint \
+	Package_fontunxppds \
+	Package_fontunxpsprint \
 ))
 
 # vim: set noet sw=4:
diff --git a/psprint_config/Zip_fontunxppds.mk b/psprint_config/Package_fontunxppds.mk
similarity index 81%
rename from psprint_config/Zip_fontunxppds.mk
rename to psprint_config/Package_fontunxppds.mk
index 3714f11..65df35d 100644
--- a/psprint_config/Zip_fontunxppds.mk
+++ b/psprint_config/Package_fontunxppds.mk
@@ -25,9 +25,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
+$(eval $(call gb_Package_Package,psprint_config_fontunxppds,$(SRCDIR)/psprint_config/configuration/ppds))
 
-$(eval $(call gb_Zip_add_files,fontunxppds,\
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxppds,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,psprint_config_fontunxppds,share/psprint/driver,\
 	SGENPRT.PS \
 	SGENT42.PS \
 ))
diff --git a/psprint_config/Zip_fontunxpsprint.mk b/psprint_config/Package_fontunxpsprint.mk
similarity index 81%
rename from psprint_config/Zip_fontunxpsprint.mk
rename to psprint_config/Package_fontunxpsprint.mk
index ec0a351..f4b8e9e 100644
--- a/psprint_config/Zip_fontunxpsprint.mk
+++ b/psprint_config/Package_fontunxpsprint.mk
@@ -25,9 +25,11 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Zip_Zip,fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
+$(eval $(call gb_Package_Package,psprint_config_fontunxpsprint,$(SRCDIR)/psprint_config/configuration))
 
-$(eval $(call gb_Zip_add_files,fontunxpsprint,\
+$(eval $(call gb_Package_set_outdir,psprint_config_fontunxpsprint,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,psprint_config_fontunxpsprint,share/psprint,\
 	psprint.conf \
 ))
 

-- 
To view, visit https://gerrit.libreoffice.org/3442
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e3046a6ed30ac8ee60940844b8ceda6ec1ffd39
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2412 at yahoo.fr>