summaryrefslogtreecommitdiff
path: root/print/hplip/patches/patch-ae
blob: 81238664dc7f11c9e8891ec77b547d058154623f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
$NetBSD: patch-ae,v 1.5 2013/04/12 03:47:30 schnoebe Exp $

# Conform to autoconf's standard variable usage, making it easier
# to install on pkgsrc platforms

# reported upstream as https://bugs.launchpad.net/hplip/+bug/726218

--- Makefile.am.orig	2013-03-08 07:15:32.000000000 +0000
+++ Makefile.am
@@ -110,11 +110,11 @@ hp_mkuri_LDADD = -ldl libhpmud.la
 hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\"
 
 # cron files
-crondir = /etc/cron.daily
+crondir = $(sysconfdir)/cron.daily
 dist_cron_DATA = data/rules/hplip_cron
 
 # hpmud.rules
-rulesdir = /etc/udev/rules.d
+rulesdir = $(sysconfdir)/udev/rules.d
 if UDEV_SYSFS_RULES
 dist_rules_DATA = data/rules/56-hpmud_support_sysfs.rules
 dist_rules_DATA += data/rules/86-hpmud_plugin_sysfs.rules
@@ -134,11 +134,11 @@ else
 dist_rules_DATA += data/rules/55-hpmud.rules
 endif
 endif
-halpredir = /usr/share/hal/fdi/preprobe/10osvendor
+halpredir = $(datadir)/hal/fdi/preprobe/10osvendor
 dist_halpre_DATA = data/rules/20-hplip-devices.fdi
 
 # hplip.conf
-hplip_confdir = /etc/hp
+hplip_confdir = $(sysconfdir)/hp
 hplip_conf_DATA = hplip.conf
 
 #pstotiff filter
@@ -146,13 +146,13 @@ pstotiffdir = $(cupsfilterdir)
 pstotiff_SCRIPTS = fax/filters/pstotiff
 
 # hplip.state
-hplip_statedir = /var/lib/hp
+hplip_statedir = ($localstatedir)/lib/hp
 dist_hplip_state_DATA =
 #dist_hplip_state_DATA = hplip.state
 
 # Log Files
-hplip_Logdir=/var/log/hp
-hplip_tmpdir=/var/log/hp/tmp
+hplip_Logdir=$(localstatedir)/log/hp
+hplip_tmpdir=$(localstatedir)/log/hp/tmp
 
 if FULL_BUILD
 
@@ -372,9 +372,9 @@ endif
 
 # PolicyKit
 if POLICYKIT_INSTALL
-policykit_dbus_etcdir = /etc/dbus-1/system.d
+policykit_dbus_etcdir = $(sysconfdir)/dbus-1/system.d
 dist_policykit_dbus_etc_DATA = data/policykit/com.hp.hplip.conf
-policykit_dbus_sharedir = /usr/share/dbus-1/system-services
+policykit_dbus_sharedir = $(datadir)/dbus-1/system-services
 dist_policykit_dbus_share_DATA = data/policykit/com.hp.hplip.service
 policykit_policydir = $(policykit_dir)
 dist_policykit_policy_DATA = data/policykit/com.hp.hplip.policy
@@ -563,25 +563,17 @@ endif
 install-dist_hplip_LogDATA:
 if FULL_BUILD
 	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
-	chmod 775 $(DESTDIR)$(hplip_Logdir)
 endif	#FULL_BUILD
 if HPLIP_BUILD
 	test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir)
-	chgrp "lp" -R $(DESTDIR)$(hplip_Logdir)
-	chmod 775 $(DESTDIR)$(hplip_Logdir)
 endif	#FULL_BUILD
 
 install-dist_hplip_tmpDATA:
 if FULL_BUILD
 	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
-	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
 endif	#FULL_BUILD
 if HPLIP_BUILD
 	test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir)
-	chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir)
-	chmod 1775 $(DESTDIR)$(hplip_tmpdir)
 endif	#FULL_BUILD
 
 install-dist_cronDATA:$(dist_cron_DATA)
@@ -600,13 +592,13 @@ install-data-hook:
 if HPLIP_BUILD
 #	   If scanner build, add hpaio entry to sane dll.conf.
 	if [ "$(scan_build)" = "yes" ]; then \
-	   $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
-	   if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
-		  touch $(DESTDIR)/etc/sane.d/dll.conf; \
+	   $(mkinstalldirs) $(DESTDIR)$(sysconfidir)/sane.d; \
+	   if [ ! -f $(DESTDIR)$(sysconfidir)/sane.d/dll.conf ]; then \
+		  touch $(DESTDIR)$(sysconfidir)/sane.d/dll.conf; \
 	   fi; \
-	   if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
-		  echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
-		  echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
+	   if ! grep ^hpaio $(DESTDIR)$(sysconfidir)/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
+		  echo "Adding hpaio entry to $(sysconfidir)/sane.d/dll.conf." ; \
+		  echo hpaio >>$(DESTDIR)$(sysconfidir)/sane.d/dll.conf ; \
 	   fi \
 	fi
 if FULL_BUILD