fdo#63197: convert psprint_config files

Change-Id: I99660704931c7341a72fe303fae47f984f968ecb
Reviewed-on: https://gerrit.libreoffice.org/3443Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

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:

psprint_config/Zip_fontunxppds.mk → 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 \
 ))

psprint_config/Zip_fontunxpsprint.mk → 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 \
 ))
 

scp2/source/ooo/file_extra_ooo.scp

@@ -221,10 +221,10 @@ End
 
 #ifndef WITHOUT_PPDS
 File gid_File_Extra_Fontunxppds
-    Dir = gid_Dir_Psprint_Driver;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Name = "fontunxppds.zip";
+    Styles = (FILELIST);
+    Name = "psprint_config_fontunxppds.filelist";
 End
 #endif
 
@@ -233,10 +233,10 @@ End
 #ifdef UNX
 
 File gid_File_Extra_Fontunxpsprint
-    Dir = gid_Dir_Psprint;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE, CONFIGFILE);
-    Name = "fontunxpsprint.zip";
+    Styles = (FILELIST, DONT_OVERWRITE, CONFIGFILE);
+    Name = "psprint_config_fontunxpsprint.filelist";
 End
 
 #endif