blob: add4fc086982a31023a27325f66a380db5f6a561 (
plain) (
blame)
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
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
|
--- Makefile.in.orig Fri Mar 23 16:39:45 2007
+++ Makefile.in Wed Apr 18 17:00:46 2007
@@ -434,7 +434,7 @@
www243dir = $(docdir)/install/step4/suse
dist_www243_DATA = $(wwwsrc)/install/step4/suse/*
www251dir = $(docdir)/install/manual
-dist_www251_DATA = $(wwwsrc)/install/manual/*
+dist_www251_DATA = $(wwwsrc)/install/manual/*.html
www252dir = $(docdir)/install/manual/distros
dist_www252_DATA = $(wwwsrc)/install/manual/distros/*
www261dir = $(docdir)/install/install
@@ -446,12 +446,12 @@
www5dir = $(docdir)/supported_devices
dist_www5_DATA = $(wwwsrc)/supported_devices/*
www6dir = $(docdir)/tech_docs
-dist_www6_DATA = $(wwwsrc)/tech_docs/*
+dist_www6_DATA = $(wwwsrc)/tech_docs/*.html
www61dir = $(docdir)/tech_docs/man_pages
-dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*
+dist_www61_DATA = $(wwwsrc)/tech_docs/man_pages/*.html
www7dir = $(docdir)/troubleshooting
dist_www7_DATA = $(wwwsrc)/troubleshooting/*
-dist_hplip_DATA = $(doc_DATA) hplip.conf
+dist_hplip_DATA = $(doc_DATA)
dist_hplip_SCRIPTS = hpssd.py __init__.py hplip.sh install.py hplip-install
cmddir = $(hplipdir)
dist_cmd_SCRIPTS = align.py info.py print.py toolbox.py clean.py colorcal.py unload.py testpage.py makeuri.py check.py fab.py levels.py \
@@ -2884,20 +2884,9 @@
#
# If scanner build, install sane backend.
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; \
- fi; \
- $(mkinstalldirs) $(DESTDIR)$(sanedir); \
- ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SONOVER); \
- ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOSHORT); \
- ln -sf ../$(SOLONG) $(DESTDIR)$(sanedir)/$(SOLONG); \
- if [ -f $(DESTDIR)/etc/sane.d/dll.conf ]; then \
- 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 ; \
- fi \
- fi \
+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SONOVER); \
+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOSHORT); \
+ ln -sf $(prefix)/lib/$(SOSHORT) $(DESTDIR)$(sanedir)/$(SOLONG); \
fi
install-data-hook: install-pcardext install-cupsext
@@ -2945,63 +2934,41 @@
done
#
# Edit hpiod.conf in destdir.
- echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
- echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\nppdbase=$(ppddir)\ndoc=$(docdir)\n" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
- echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
+ echo -e "\n[$(PACKAGE)]\nversion=$(VERSION)\njdprobe=0\n" >> $(PACKAGE).conf
+ echo -e "[dirs]\nhome=$(hplipdir)\nrun=$(rundir)\nppd=$(hpppddir)\nppdbase=$(ppddir)\ndoc=$(docdir)\n" >> $(PACKAGE).conf
+ echo -e "# Following values are determined at configure time and cannot be changed.\n[configure]" >> $(PACKAGE).conf
if [ "$(network_build)" = "yes" ]; then \
- echo -e "network-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
+ echo -e "network-build=1" >> $(PACKAGE).conf; \
else \
- echo -e "network-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
+ echo -e "network-build=0" >> $(PACKAGE).conf; \
fi
if [ "$(pp_build)" = "yes" ]; then \
- echo -e "pp-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
+ echo -e "pp-build=1" >> $(PACKAGE).conf; \
else \
- echo -e "pp-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
+ echo -e "pp-build=0" >> $(PACKAGE).conf; \
fi
if [ "$(gui_build)" = "yes" ]; then \
- echo -e "gui-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
+ echo -e "gui-build=1" >> $(PACKAGE).conf; \
else \
- echo -e "gui-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
+ echo -e "gui-build=0" >> $(PACKAGE).conf; \
fi
if [ "$(scan_build)" = "yes" ]; then \
- echo -e "scanner-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
+ echo -e "scanner-build=1" >> $(PACKAGE).conf; \
else \
- echo -e "scanner-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
+ echo -e "scanner-build=0" >> $(PACKAGE).conf; \
fi
if [ "$(fax_build)" = "yes" ]; then \
- echo -e "fax-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
+ echo -e "fax-build=1" >> $(PACKAGE).conf; \
else \
- echo -e "fax-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
+ echo -e "fax-build=0" >> $(PACKAGE).conf; \
fi
if [ "$(cups11_build)" = "yes" ]; then \
- echo -e "cups11-build=1" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
+ echo -e "cups11-build=1" >> $(PACKAGE).conf; \
else \
- echo -e "cups11-build=0" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf; \
- fi
- echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
- echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(DESTDIR)$(hplipdir)/$(PACKAGE).conf
-#
-# Install hpiod.conf.
- $(mkinstalldirs) $(DESTDIR)/etc/hp
- $(INSTALL_DATA) $(DESTDIR)$(hplipdir)/$(PACKAGE).conf $(DESTDIR)/etc/hp
-#
-# Create hpiod start/stop script from hpiod.sh in destdir.
- sed 's:HPIODDIR=:HPIODDIR=$(sbindir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).sh > $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp; \
- sed 's:HPSSDDIR=:HPSSDDIR=$(hplipdir):' < $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp > $(DESTDIR)$(hplipdir)/$(PACKAGE); \
- rm -f $(DESTDIR)$(hplipdir)/$(PACKAGE).tmp
-#
-# Install hpiod start/stop script.
- $(mkinstalldirs) $(DESTDIR)/etc/init.d
- $(INSTALL_SCRIPT) $(DESTDIR)$(hplipdir)/$(PACKAGE) $(DESTDIR)/etc/init.d
-#
-# Run chkconfig/install_initd if DESTDIR="".
- if [ "$(DESTDIR)" = "" ]; then \
- if [ "$(INSTALLINITD)" != "" ]; then \
- $(INSTALLINITD) $(PACKAGE); \
- elif [ "$(CHKCONFIG)" != "" ]; then \
- $(CHKCONFIG) $(PACKAGE) reset; \
- fi \
+ echo -e "cups11-build=0" >> $(PACKAGE).conf; \
fi
+ echo -e "installinitd=$(INSTALLINITD)\nchkconfig=$(CHKCONFIG)" >> $(PACKAGE).conf
+ echo -e "internal-tag=$(PACKAGE_BUGREPORT)" >> $(PACKAGE).conf
#
# Install fax support. Let hpijs symlink hpppddir to cupsppddir.
if [ "$(fax_build)" = "yes" ]; then \
@@ -3032,8 +2999,8 @@
done
#
# Remove hplip.conf and hplip start/stop script.
- rm -f $(DESTDIR)/etc/hp/$(PACKAGE).conf
- rm -f $(DESTDIR)/etc/init.d/$(PACKAGE)
+ rm -f $(DESTDIR)/usr/local/etc/hp/$(PACKAGE).conf
+ rm -f $(DESTDIR)/usr/local/etc/rc.d/$(PACKAGE)
#
# Remove fax support.
rm -f $(DESTDIR)$(hpfaxdir)/hpfax
|
