summaryrefslogtreecommitdiff
path: root/psprint_config
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2013-04-17 22:30:52 +0200
committerDavid Tardon <dtardon@redhat.com>2013-04-18 04:06:07 +0000
commite725872d49e8b176e2c9be4fde5d5f76256daf45 (patch)
tree8afc674b9eab4ef60a6c0488631f309127a773cd /psprint_config
parent0b4315077a6827798e1d2bdae73298365ba9a018 (diff)
fdo#63197: convert psprint_config files
Change-Id: I99660704931c7341a72fe303fae47f984f968ecb Reviewed-on: https://gerrit.libreoffice.org/3443 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'psprint_config')
-rw-r--r--psprint_config/Module_psprint_config.mk4
-rw-r--r--psprint_config/Package_fontunxppds.mk (renamed from psprint_config/Zip_fontunxppds.mk)6
-rw-r--r--psprint_config/Package_fontunxpsprint.mk (renamed from psprint_config/Zip_fontunxpsprint.mk)6
3 files changed, 10 insertions, 6 deletions
diff --git a/psprint_config/Module_psprint_config.mk b/psprint_config/Module_psprint_config.mk
index 5c30c9fceed5..0d35eb01597a 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
index 3714f11a3550..65df35d6f968 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
index ec0a351e5ac5..f4b8e9ef8d4a 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 \
))