Ticket #42776: patch-Makefile.in

File patch-Makefile.in, 8.6 KB (added by okmacports@…, 7 years ago)
Line 
1--- ./Makefile.in.orig  2014-03-10 14:44:40.000000000 +0100
2+++ ./Makefile.in       2014-03-10 14:56:40.000000000 +0100
3@@ -413,7 +413,7 @@
4        prnt/hpcups/dj600ColorMaps.cpp prnt/hpcups/dj970ColorMaps.cpp \
5        prnt/hpcups/dj8xxColorMaps.cpp prnt/hpcups/dj4100ColorMaps.cpp \
6        prnt/hpcups/BreakTables.cpp prnt/hpcups/PrinterCommands.h \
7-       prnt/hpcups/Utils.cpp prnt/hpcups/Utils.h \
8+       prnt/hpcups/HPCupsUtils.cpp prnt/hpcups/HPCupsUtils.h \
9        prnt/hpcups/SystemServices.cpp prnt/hpcups/SystemServices.h \
10        prnt/hpcups/CommonDefinitions.h prnt/hpcups/hpjbig_wrapper.h \
11        prnt/hpcups/apPrintModes.h prnt/hpcups/dj400PrintModes.h \
12@@ -4415,14 +4415,14 @@
13 @HPLIP_BUILD_TRUE@dist_rulessystem_DATA = data/rules/hplip-printer@.service
14 
15 # hpmud.rules
16-@HPLIP_BUILD_TRUE@rulesdir = /etc/udev/rules.d
17+@HPLIP_BUILD_TRUE@rulesdir = @PREFIX@/etc/udev/rules.d
18 @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_FALSE@dist_rules_DATA = data/rules/56-hpmud.rules
19 @HPLIP_BUILD_TRUE@@UDEV_SYSFS_RULES_TRUE@dist_rules_DATA = data/rules/56-hpmud_sysfs.rules
20 @HPLIP_BUILD_TRUE@halpredir = /usr/share/hal/fdi/preprobe/10osvendor
21 @HPLIP_BUILD_TRUE@dist_halpre_DATA = data/rules/20-hplip-devices.fdi
22 
23 # hplip.conf
24-@HPLIP_BUILD_TRUE@hplip_confdir = /etc/hp
25+@HPLIP_BUILD_TRUE@hplip_confdir = @PREFIX@/etc/hp
26 @HPLIP_BUILD_TRUE@hplip_conf_DATA = hplip.conf
27 
28 #pstotiff filter
29@@ -4430,7 +4430,7 @@
30 @HPLIP_BUILD_TRUE@pstotiff_SCRIPTS = fax/filters/pstotiff
31 
32 # hplip.state
33-@HPLIP_BUILD_TRUE@hplip_statedir = /var/lib/hp
34+@HPLIP_BUILD_TRUE@hplip_statedir = @PREFIX@/var/lib/hp
35 @HPLIP_BUILD_TRUE@dist_hplip_state_DATA =
36 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
37 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@cmddir = $(hplipdir)
38@@ -4692,7 +4692,7 @@
39 @HPCUPS_INSTALL_TRUE@  prnt/hpcups/Halftoner.cpp prnt/hpcups/Halftoner.h prnt/hpcups/Scaler.cpp prnt/hpcups/Scaler.h prnt/hpcups/resources.h \
40 @HPCUPS_INSTALL_TRUE@  prnt/hpcups/dj400ColorMaps.cpp prnt/hpcups/dj600ColorMaps.cpp prnt/hpcups/dj970ColorMaps.cpp prnt/hpcups/dj8xxColorMaps.cpp \
41 @HPCUPS_INSTALL_TRUE@  prnt/hpcups/dj4100ColorMaps.cpp \
42-@HPCUPS_INSTALL_TRUE@  prnt/hpcups/BreakTables.cpp prnt/hpcups/PrinterCommands.h prnt/hpcups/Utils.cpp prnt/hpcups/Utils.h \
43+@HPCUPS_INSTALL_TRUE@  prnt/hpcups/BreakTables.cpp prnt/hpcups/PrinterCommands.h prnt/hpcups/HPCupsUtils.cpp prnt/hpcups/HPCupsUtils.h \
44 @HPCUPS_INSTALL_TRUE@  prnt/hpcups/SystemServices.cpp prnt/hpcups/SystemServices.h prnt/hpcups/CommonDefinitions.h prnt/hpcups/hpjbig_wrapper.h \
45 @HPCUPS_INSTALL_TRUE@  prnt/hpcups/apPrintModes.h prnt/hpcups/dj400PrintModes.h prnt/hpcups/dj540PrintModes.h prnt/hpcups/dj600PrintModes.h \
46 @HPCUPS_INSTALL_TRUE@  prnt/hpcups/dj630PrintModes.h prnt/hpcups/dj690PrintModes.h prnt/hpcups/dj850PrintModes.h prnt/hpcups/dj890PrintModes.h \
47@@ -7233,19 +7233,19 @@
48 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
49 @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -c -o hpcups-BreakTables.obj `if test -f 'prnt/hpcups/BreakTables.cpp'; then $(CYGPATH_W) 'prnt/hpcups/BreakTables.cpp'; else $(CYGPATH_W) '$(srcdir)/prnt/hpcups/BreakTables.cpp'; fi`
50 
51-hpcups-Utils.o: prnt/hpcups/Utils.cpp
52-@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -MT hpcups-Utils.o -MD -MP -MF $(DEPDIR)/hpcups-Utils.Tpo -c -o hpcups-Utils.o `test -f 'prnt/hpcups/Utils.cpp' || echo '$(srcdir)/'`prnt/hpcups/Utils.cpp
53+hpcups-Utils.o: prnt/hpcups/HPCupsUtils.cpp
54+@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -MT hpcups-Utils.o -MD -MP -MF $(DEPDIR)/hpcups-Utils.Tpo -c -o hpcups-Utils.o `test -f 'prnt/hpcups/HPCupsUtils.cpp' || echo '$(srcdir)/'`prnt/hpcups/HPCupsUtils.cpp
55 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/hpcups-Utils.Tpo $(DEPDIR)/hpcups-Utils.Po
56-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='prnt/hpcups/Utils.cpp' object='hpcups-Utils.o' libtool=no @AMDEPBACKSLASH@
57+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='prnt/hpcups/HPCupsUtils.cpp' object='hpcups-Utils.o' libtool=no @AMDEPBACKSLASH@
58 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
59-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -c -o hpcups-Utils.o `test -f 'prnt/hpcups/Utils.cpp' || echo '$(srcdir)/'`prnt/hpcups/Utils.cpp
60+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -c -o hpcups-Utils.o `test -f 'prnt/hpcups/HPCupsUtils.cpp' || echo '$(srcdir)/'`prnt/hpcups/HPCupsUtils.cpp
61 
62-hpcups-Utils.obj: prnt/hpcups/Utils.cpp
63-@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -MT hpcups-Utils.obj -MD -MP -MF $(DEPDIR)/hpcups-Utils.Tpo -c -o hpcups-Utils.obj `if test -f 'prnt/hpcups/Utils.cpp'; then $(CYGPATH_W) 'prnt/hpcups/Utils.cpp'; else $(CYGPATH_W) '$(srcdir)/prnt/hpcups/Utils.cpp'; fi`
64+hpcups-Utils.obj: prnt/hpcups/HPCupsUtils.cpp
65+@am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -MT hpcups-Utils.obj -MD -MP -MF $(DEPDIR)/hpcups-Utils.Tpo -c -o hpcups-Utils.obj `if test -f 'prnt/hpcups/HPCupsUtils.cpp'; then $(CYGPATH_W) 'prnt/hpcups/HPCupsUtils.cpp'; else $(CYGPATH_W) '$(srcdir)/prnt/hpcups/HPCupsUtils.cpp'; fi`
66 @am__fastdepCXX_TRUE@  $(am__mv) $(DEPDIR)/hpcups-Utils.Tpo $(DEPDIR)/hpcups-Utils.Po
67-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='prnt/hpcups/Utils.cpp' object='hpcups-Utils.obj' libtool=no @AMDEPBACKSLASH@
68+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='prnt/hpcups/HPCupsUtils.cpp' object='hpcups-Utils.obj' libtool=no @AMDEPBACKSLASH@
69 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
70-@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -c -o hpcups-Utils.obj `if test -f 'prnt/hpcups/Utils.cpp'; then $(CYGPATH_W) 'prnt/hpcups/Utils.cpp'; else $(CYGPATH_W) '$(srcdir)/prnt/hpcups/Utils.cpp'; fi`
71+@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -c -o hpcups-Utils.obj `if test -f 'prnt/hpcups/HPCupsUtils.cpp'; then $(CYGPATH_W) 'prnt/hpcups/HPCupsUtils.cpp'; else $(CYGPATH_W) '$(srcdir)/prnt/hpcups/HPCupsUtils.cpp'; fi`
72 
73 hpcups-SystemServices.o: prnt/hpcups/SystemServices.cpp
74 @am__fastdepCXX_TRUE@  $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(hpcups_CXXFLAGS) $(CXXFLAGS) -MT hpcups-SystemServices.o -MD -MP -MF $(DEPDIR)/hpcups-SystemServices.Tpo -c -o hpcups-SystemServices.o `test -f 'prnt/hpcups/SystemServices.cpp' || echo '$(srcdir)/'`prnt/hpcups/SystemServices.cpp
75@@ -8814,13 +8814,13 @@
76 install-data-hook:
77 #         If scanner build, add hpaio entry to sane dll.conf.
78 @HPLIP_BUILD_TRUE@     if [ "$(scan_build)" = "yes" ]; then \
79-@HPLIP_BUILD_TRUE@        $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
80-@HPLIP_BUILD_TRUE@        if [ ! -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
81-@HPLIP_BUILD_TRUE@               touch $(DESTDIR)/etc/sane.d/dll.conf; \
82+@HPLIP_BUILD_TRUE@        $(mkinstalldirs) $(DESTDIR)@PREFIX@/etc/sane.d; \
83+@HPLIP_BUILD_TRUE@        if [ ! -f $(DESTDIR)@PREFIX@/etc/sane.d/dll.conf ]; then \
84+@HPLIP_BUILD_TRUE@               touch $(DESTDIR)@PREFIX@/etc/sane.d/dll.conf; \
85 @HPLIP_BUILD_TRUE@        fi; \
86-@HPLIP_BUILD_TRUE@        if ! grep ^hpaio $(DESTDIR)/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
87-@HPLIP_BUILD_TRUE@               echo "Adding hpaio entry to /etc/sane.d/dll.conf." ; \
88-@HPLIP_BUILD_TRUE@               echo hpaio >>$(DESTDIR)/etc/sane.d/dll.conf ; \
89+@HPLIP_BUILD_TRUE@        if ! grep ^hpaio $(DESTDIR)@PREFIX@/etc/sane.d/dll.conf >/dev/null 2>/dev/null ; then \
90+@HPLIP_BUILD_TRUE@               echo "Adding hpaio entry to @PREFIX@/etc/sane.d/dll.conf." ; \
91+@HPLIP_BUILD_TRUE@               echo hpaio >>$(DESTDIR)@PREFIX@/etc/sane.d/dll.conf ; \
92 @HPLIP_BUILD_TRUE@        fi \
93 @HPLIP_BUILD_TRUE@     fi
94 #         Create hp-xxx commands in bindir.
95@@ -8828,7 +8828,7 @@
96 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@    for i in $(dist_cmd_SCRIPTS); do \
97 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@       cmd=`basename $$i .py`; \
98 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@       if [ ! \( "$$cmd" = "toolbox" -a "$(gui_build)" = "no" \) ]; then \
99-@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@              ln -sf ../share/$(PACKAGE)/$$i $(DESTDIR)$(bindir)/hp-$$cmd; \
100+@FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@              ln -sf ${datadir}/$(PACKAGE)/$$i $(DESTDIR)$(bindir)/hp-$$cmd; \
101 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@       fi \
102 @FULL_BUILD_TRUE@@HPLIP_BUILD_TRUE@    done
103 #