Ticket #42776: patch-Makefile.am

File patch-Makefile.am, 2.8 KB (added by okmacports@…, 7 years ago)
Line 
1--- ./Makefile.am.orig  2014-03-10 14:44:32.000000000 +0100
2+++ ./Makefile.am       2014-03-10 14:56:40.000000000 +0100
3@@ -109,7 +109,7 @@
4 dist_rulessystem_DATA =data/rules/hplip-printer@.service
5 
6 # hpmud.rules
7-rulesdir = /etc/udev/rules.d
8+rulesdir = @PREFIX@/etc/udev/rules.d
9 if UDEV_SYSFS_RULES
10 dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
11 else
12@@ -120,7 +120,7 @@
13 dist_halpre_DATA = data/rules/20-hplip-devices.fdi
14 
15 # hplip.conf
16-hplip_confdir = /etc/hp
17+hplip_confdir = @PREFIX@/etc/hp
18 hplip_conf_DATA = hplip.conf
19 
20 #pstotiff filter
21@@ -128,7 +128,7 @@
22 pstotiff_SCRIPTS = fax/filters/pstotiff
23 
24 # hplip.state
25-hplip_statedir = /var/lib/hp
26+hplip_statedir = @PREFIX@/var/lib/hp
27 dist_hplip_state_DATA =
28 
29 if FULL_BUILD
30@@ -460,7 +460,7 @@
31        prnt/hpcups/Halftoner.cpp prnt/hpcups/Halftoner.h prnt/hpcups/Scaler.cpp prnt/hpcups/Scaler.h prnt/hpcups/resources.h \
32        prnt/hpcups/dj400ColorMaps.cpp prnt/hpcups/dj600ColorMaps.cpp prnt/hpcups/dj970ColorMaps.cpp prnt/hpcups/dj8xxColorMaps.cpp \
33        prnt/hpcups/dj4100ColorMaps.cpp \
34-       prnt/hpcups/BreakTables.cpp prnt/hpcups/PrinterCommands.h prnt/hpcups/Utils.cpp prnt/hpcups/Utils.h \
35+       prnt/hpcups/BreakTables.cpp prnt/hpcups/PrinterCommands.h prnt/hpcups/HPCupsUtils.cpp prnt/hpcups/HPCupsUtils.h \
36        prnt/hpcups/SystemServices.cpp prnt/hpcups/SystemServices.h prnt/hpcups/CommonDefinitions.h prnt/hpcups/hpjbig_wrapper.h \
37        prnt/hpcups/apPrintModes.h prnt/hpcups/dj400PrintModes.h prnt/hpcups/dj540PrintModes.h prnt/hpcups/dj600PrintModes.h \
38        prnt/hpcups/dj630PrintModes.h prnt/hpcups/dj690PrintModes.h prnt/hpcups/dj850PrintModes.h prnt/hpcups/dj890PrintModes.h \
39@@ -525,13 +525,13 @@
40 if HPLIP_BUILD
41 #         If scanner build, add hpaio entry to sane dll.conf.
42        if [ "$(scan_build)" = "yes" ]; then \
43-          $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
44-          if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
45-                 touch $(DESTDIR)/etc/sane.d/dll.conf; \
46+          $(mkinstalldirs) $(DESTDIR)@PREFIX@/etc/sane.d; \
47+          if [ ! -f $(DESTDIR)@PREFIX@/etc/sane.d/dll.conf ]; then \
48+                 touch $(DESTDIR)@PREFIX@/etc/sane.d/dll.conf; \
49           fi; \
50-          if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
51-                 echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
52-                 echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
53+          if ! grep ^hpaio $(DESTDIR)@PREFIX@/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
54+                 echo "Adding hpaio entry to @PREFIX@/etc/sane.d/dll.conf." ; \
55+                 echo hpaio >>$(DESTDIR)@PREFIX@/etc/sane.d/dll.conf ; \
56           fi \
57        fi
58 if FULL_BUILD
59@@ -540,7 +540,7 @@
60        for i in $(dist_cmd_SCRIPTS); do \
61           cmd=`basename $$i .py`; \
62           if [ ! \( "$$cmd" = "toolbox" -a "$(gui_build)" = "no" \) ]; then \
63-                 ln -sf ../share/$(PACKAGE)/$$i $(DESTDIR)$(bindir)/hp-$$cmd; \
64+                 ln -sf ${datadir}/$(PACKAGE)/$$i $(DESTDIR)$(bindir)/hp-$$cmd; \
65           fi \
66        done
67 #