New Ticket     Wiki     Browse Source     Timeline     Roadmap     Ticket Reports     Search

Ticket #7201: patch-Makefile

File patch-Makefile, 12.5 KB (added by okmacports@…, 17 months ago)
Line 
1--- Makefile.am.orig    2006-09-01 21:44:00.000000000 +0200
2+++ Makefile.am 2010-12-19 16:11:20.000000000 +0100
3@@ -219,19 +219,11 @@
4 
5 install-pcardext:
6        cd pcard/pcardext; \
7-       if [ "$(DESTDIR)" = "" ]; then \
8-          $(PYTHON) setup.py install --prefix=$(prefix); \
9-       else \
10-          $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix); \
11-       fi
12+       $(PYTHON) setup.py install
13 
14 install-cupsext:
15        cd prnt/cupsext; \
16-       if [ "$(DESTDIR)" = "" ]; then \
17-          $(PYTHON) setup.py install --prefix=$(prefix); \
18-       else \
19-          $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix); \
20-       fi
21+       $(PYTHON) setup.py install
22 
23 install-exec-hook:
24 #
25--- Makefile.in.orig    2006-09-15 23:43:33.000000000 +0200
26+++ Makefile.in 2010-12-19 16:09:03.000000000 +0100
27@@ -2408,19 +2408,11 @@
28 
29 install-pcardext:
30        cd pcard/pcardext; \
31-       if [ "$(DESTDIR)" = "" ]; then \
32-          $(PYTHON) setup.py install --prefix=$(prefix); \
33-       else \
34-          $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix); \
35-       fi
36+       $(PYTHON) setup.py install
37 
38 install-cupsext:
39        cd prnt/cupsext; \
40-       if [ "$(DESTDIR)" = "" ]; then \
41-          $(PYTHON) setup.py install --prefix=$(prefix); \
42-       else \
43-          $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix); \
44-       fi
45+       $(PYTHON) setup.py install
46 
47 install-exec-hook:
48 #
49--- Makefile.am.orig    2010-12-19 17:19:52.000000000 +0100
50+++ Makefile.am 2010-12-19 17:20:49.000000000 +0100
51@@ -257,24 +257,24 @@
52 #
53 #       Create ICON file in srcdir.
54        if [ "$(ICON_FILE)" = "hplip.desktop" ]; then \
55-          echo -e "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \
56-          echo -e "Version=0.6" >> $(srcdir)/$(ICON_FILE); \
57-          echo -e "Type=Application" >> $(srcdir)/$(ICON_FILE); \
58-          echo -e "Name=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
59-          echo -e "GenericName=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
60-          echo -e "Comment=View device status, ink levels and perform maintenance." >> $(srcdir)/$(ICON_FILE); \
61-          echo -e "Exec=$(datadir)/hplip/toolbox" >> $(srcdir)/$(ICON_FILE); \
62-          echo -e "Icon=$(imagesdir)/HPmenu.png" >> $(srcdir)/$(ICON_FILE); \
63-          echo -e "Terminal=false" >> $(srcdir)/$(ICON_FILE); \
64-          echo -e "Categories=Application;Utility;" >> $(srcdir)/$(ICON_FILE); \
65-          echo -e "X-KDE-StartupNotify=false" >> $(srcdir)/$(ICON_FILE); \
66-          echo -e "StartupNotify=false" >> $(srcdir)/$(ICON_FILE); \
67+          echo  "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \
68+          echo  "Version=0.6" >> $(srcdir)/$(ICON_FILE); \
69+          echo  "Type=Application" >> $(srcdir)/$(ICON_FILE); \
70+          echo  "Name=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
71+          echo  "GenericName=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
72+          echo  "Comment=View device status, ink levels and perform maintenance." >> $(srcdir)/$(ICON_FILE); \
73+          echo  "Exec=$(datadir)/hplip/toolbox" >> $(srcdir)/$(ICON_FILE); \
74+          echo  "Icon=$(imagesdir)/HPmenu.png" >> $(srcdir)/$(ICON_FILE); \
75+          echo  "Terminal=false" >> $(srcdir)/$(ICON_FILE); \
76+          echo  "Categories=Application;Utility;" >> $(srcdir)/$(ICON_FILE); \
77+          echo  "X-KDE-StartupNotify=false" >> $(srcdir)/$(ICON_FILE); \
78+          echo  "StartupNotify=false" >> $(srcdir)/$(ICON_FILE); \
79        fi
80        if [ "$(ICON_FILE)" = "hplip" ]; then \
81-          echo -e "?package(xbase):command=\"$(datadir)/hplip/toolbox\" icon=\"$(imagesdir)/HPmenu.png\" \\" > $(srcdir)/$(ICON_FILE); \
82-          echo -e "                needs=\"X11\" section=\"Application/Utility\" title=\"HPLIP\" \\" >> $(srcdir)/$(ICON_FILE); \
83-          echo -e "                longtitle=\"HPLIP Device Manager\" \\" >> $(srcdir)/$(ICON_FILE); \
84-          echo -e "                mimetypes=\"\" accept_url=\"false\" multiple_files=\"true\"" >> $(srcdir)/$(ICON_FILE); \
85+          echo  "?package(xbase):command=\"$(datadir)/hplip/toolbox\" icon=\"$(imagesdir)/HPmenu.png\" \\" > $(srcdir)/$(ICON_FILE); \
86+          echo  "                needs=\"X11\" section=\"Application/Utility\" title=\"HPLIP\" \\" >> $(srcdir)/$(ICON_FILE); \
87+          echo  "                longtitle=\"HPLIP Device Manager\" \\" >> $(srcdir)/$(ICON_FILE); \
88+          echo  "                mimetypes=\"\" accept_url=\"false\" multiple_files=\"true\"" >> $(srcdir)/$(ICON_FILE); \
89        fi
90        if [ "$(ICON_FILE)" != "" ]; then \
91           $(INSTALL_DATA)  $(srcdir)/$(ICON_FILE) $(DESTDIR)$(icondir); \
92@@ -298,35 +298,35 @@
93        done
94 #
95 #       Edit hpiod.conf in destdir.
96-       echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
97-       echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\ndoc=$(docdir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
98-       echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
99+       echo  "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
100+       echo  "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\ndoc=$(docdir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
101+       echo  "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
102        if [ "$(network_build)" = "yes" ]; then \
103-          echo -e "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
104+          echo  "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
105        else \
106-          echo -e "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
107+          echo  "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
108        fi
109        if [ "$(pp_build)" = "yes" ]; then \
110-          echo -e "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
111+          echo  "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
112        else \
113-          echo -e "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
114+          echo  "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
115        fi
116        if [ "$(gui_build)" = "yes" ]; then \
117-          echo -e "gui-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
118+          echo  "gui-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
119        else \
120-          echo -e "gui-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
121+          echo  "gui-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
122        fi
123        if [ "$(scan_build)" = "yes" ]; then \
124-          echo -e "scanner-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
125+          echo  "scanner-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
126        else \
127-          echo -e "scanner-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
128+          echo  "scanner-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
129        fi
130        if [ "$(fax_build)" = "yes" ]; then \
131-          echo -e "fax-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
132+          echo  "fax-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
133        else \
134-          echo -e "fax-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
135+          echo  "fax-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
136        fi
137-       echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
138+       echo  "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
139 #
140 #       Install hpiod.conf.
141        $(mkinstalldirs) $(DESTDIR)/etc/hp
142--- Makefile.in.orig    2010-12-19 17:20:00.000000000 +0100
143+++ Makefile.in 2010-12-19 17:20:24.000000000 +0100
144@@ -2446,24 +2446,24 @@
145 #
146 #       Create ICON file in srcdir.
147        if [ "$(ICON_FILE)" = "hplip.desktop" ]; then \
148-          echo -e "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \
149-          echo -e "Version=0.6" >> $(srcdir)/$(ICON_FILE); \
150-          echo -e "Type=Application" >> $(srcdir)/$(ICON_FILE); \
151-          echo -e "Name=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
152-          echo -e "GenericName=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
153-          echo -e "Comment=View device status, ink levels and perform maintenance." >> $(srcdir)/$(ICON_FILE); \
154-          echo -e "Exec=$(datadir)/hplip/toolbox" >> $(srcdir)/$(ICON_FILE); \
155-          echo -e "Icon=$(imagesdir)/HPmenu.png" >> $(srcdir)/$(ICON_FILE); \
156-          echo -e "Terminal=false" >> $(srcdir)/$(ICON_FILE); \
157-          echo -e "Categories=Application;Utility;" >> $(srcdir)/$(ICON_FILE); \
158-          echo -e "X-KDE-StartupNotify=false" >> $(srcdir)/$(ICON_FILE); \
159-          echo -e "StartupNotify=false" >> $(srcdir)/$(ICON_FILE); \
160+          echo  "[Desktop Entry]" > $(srcdir)/$(ICON_FILE); \
161+          echo  "Version=0.6" >> $(srcdir)/$(ICON_FILE); \
162+          echo  "Type=Application" >> $(srcdir)/$(ICON_FILE); \
163+          echo  "Name=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
164+          echo  "GenericName=HP Device Manager" >> $(srcdir)/$(ICON_FILE); \
165+          echo  "Comment=View device status, ink levels and perform maintenance." >> $(srcdir)/$(ICON_FILE); \
166+          echo  "Exec=$(datadir)/hplip/toolbox" >> $(srcdir)/$(ICON_FILE); \
167+          echo  "Icon=$(imagesdir)/HPmenu.png" >> $(srcdir)/$(ICON_FILE); \
168+          echo  "Terminal=false" >> $(srcdir)/$(ICON_FILE); \
169+          echo  "Categories=Application;Utility;" >> $(srcdir)/$(ICON_FILE); \
170+          echo  "X-KDE-StartupNotify=false" >> $(srcdir)/$(ICON_FILE); \
171+          echo  "StartupNotify=false" >> $(srcdir)/$(ICON_FILE); \
172        fi
173        if [ "$(ICON_FILE)" = "hplip" ]; then \
174-          echo -e "?package(xbase):command=\"$(datadir)/hplip/toolbox\" icon=\"$(imagesdir)/HPmenu.png\" \\" > $(srcdir)/$(ICON_FILE); \
175-          echo -e "                needs=\"X11\" section=\"Application/Utility\" title=\"HPLIP\" \\" >> $(srcdir)/$(ICON_FILE); \
176-          echo -e "                longtitle=\"HPLIP Device Manager\" \\" >> $(srcdir)/$(ICON_FILE); \
177-          echo -e "                mimetypes=\"\" accept_url=\"false\" multiple_files=\"true\"" >> $(srcdir)/$(ICON_FILE); \
178+          echo  "?package(xbase):command=\"$(datadir)/hplip/toolbox\" icon=\"$(imagesdir)/HPmenu.png\" \\" > $(srcdir)/$(ICON_FILE); \
179+          echo  "                needs=\"X11\" section=\"Application/Utility\" title=\"HPLIP\" \\" >> $(srcdir)/$(ICON_FILE); \
180+          echo  "                longtitle=\"HPLIP Device Manager\" \\" >> $(srcdir)/$(ICON_FILE); \
181+          echo  "                mimetypes=\"\" accept_url=\"false\" multiple_files=\"true\"" >> $(srcdir)/$(ICON_FILE); \
182        fi
183        if [ "$(ICON_FILE)" != "" ]; then \
184           $(INSTALL_DATA)  $(srcdir)/$(ICON_FILE) $(DESTDIR)$(icondir); \
185@@ -2487,35 +2487,35 @@
186        done
187 #
188 #       Edit hpiod.conf in destdir.
189-       echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
190-       echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\ndoc=$(docdir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
191-       echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
192+       echo  "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
193+       echo  "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\ndoc=$(docdir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
194+       echo  "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
195        if [ "$(network_build)" = "yes" ]; then \
196-          echo -e "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
197+          echo  "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
198        else \
199-          echo -e "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
200+          echo  "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
201        fi
202        if [ "$(pp_build)" = "yes" ]; then \
203-          echo -e "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
204+          echo  "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
205        else \
206-          echo -e "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
207+          echo  "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
208        fi
209        if [ "$(gui_build)" = "yes" ]; then \
210-          echo -e "gui-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
211+          echo  "gui-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
212        else \
213-          echo -e "gui-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
214+          echo  "gui-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
215        fi
216        if [ "$(scan_build)" = "yes" ]; then \
217-          echo -e "scanner-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
218+          echo  "scanner-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
219        else \
220-          echo -e "scanner-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
221+          echo  "scanner-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
222        fi
223        if [ "$(fax_build)" = "yes" ]; then \
224-          echo -e "fax-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
225+          echo  "fax-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
226        else \
227-          echo -e "fax-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
228+          echo  "fax-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
229        fi
230-       echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
231+       echo  "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf;
232 #
233 #       Install hpiod.conf.
234        $(mkinstalldirs) $(DESTDIR)/etc/hp