]>
Commit | Line | Data |
---|---|---|
4c47015d | 1 | diff -uNdr nut-0.45.0.old/Makefile.in nut-0.45.0/Makefile.in |
2 | --- nut-0.45.0.old/Makefile.in Mon Mar 19 06:05:01 2001 | |
3 | +++ nut-0.45.0/Makefile.in Mon Jul 2 12:11:29 2001 | |
f9d737f9 | 4 | @@ -2,11 +2,10 @@ |
bca7d0b3 | 5 | |
6 | # directory definitions | |
f9d737f9 | 7 | prefix = @prefix@ |
8 | -BASEPATH = $(INSTALLROOT)@prefix@ | |
9 | -CONFPATH = $(INSTALLROOT)@sysconfdir@ | |
10 | -CGIPATH = $(INSTALLROOT)@CGIPATH@ | |
11 | -INSTALLDIRS = $(CONFPATH) $(CGIPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@ $(BASEPATH)/misc | |
12 | -STATEPATH = $(INSTALLROOT)@STATEPATH@ | |
13 | +prefix = @prefix@ | |
14 | +sysconfdir = @sysconfdir@ | |
15 | +CGIPATH = @CGIPATH@ | |
16 | +STATEPATH = @STATEPATH@ | |
17 | ||
18 | SUBDIRS = common models server clients man | |
19 | CFLAGS = -I../include @CFLAGS@ | |
4c47015d | 20 | @@ -45,33 +44,22 @@ |
bca7d0b3 | 21 | rm $$i/Makefile; \ |
22 | done | |
23 | ||
24 | -install: install-dirs | |
bca7d0b3 | 25 | +install: |
f9d737f9 | 26 | @echo Installing in $(BASEPATH)... |
bca7d0b3 | 27 | |
28 | @for i in $(SUBDIRS) conf; do \ | |
29 | - cd $$i; $(MAKE) install; cd ..; \ | |
4c47015d | 30 | - done |
31 | - | |
bca7d0b3 | 32 | -install-dirs: |
33 | - @for d in $(INSTALLDIRS); do \ | |
34 | - if (test ! -d $$d) then \ | |
35 | - $(INSTALLCMD) -d $$d || exit 1; \ | |
36 | - fi \ | |
4c47015d | 37 | + cd $$i; $(MAKE) DESTDIR=$(DESTDIR) install; cd ..; \ |
38 | done | |
39 | ||
bca7d0b3 | 40 | - @if (test ! -d $(STATEPATH)) then \ |
f9d737f9 | 41 | - $(INSTALLCMD) -d -o $(RUNUID) -g $(RUNGID) $(STATEPATH) || exit 1; \ |
bca7d0b3 | 42 | - fi |
43 | - | |
44 | cgi: | |
45 | @cd clients; $(MAKE) cgi; cd ..; | |
46 | ||
47 | -install-cgi: install-dirs | |
48 | +install-cgi: | |
49 | @cd conf; $(MAKE) install; cd ..; | |
50 | - @cd clients; $(MAKE) install-cgi; cd ..; | |
51 | + @cd clients; $(MAKE) DESTDIR=$(DESTDIR) install-cgi; cd ..; | |
52 | ||
53 | -install-misc: install-dirs | |
54 | - @cd clients; $(MAKE) install-misc; cd ..; | |
55 | +install-misc: | |
56 | + @cd clients; $(MAKE) DESTDIR=$(DESTDIR) install-misc; cd ..; | |
57 | ||
58 | # This is only used to set the "official" version before it goes out the door. | |
59 | # | |
4c47015d | 60 | diff -uNdr nut-0.45.0.old/clients/Makefile.in nut-0.45.0/clients/Makefile.in |
61 | --- nut-0.45.0.old/clients/Makefile.in Thu Feb 1 06:02:53 2001 | |
62 | +++ nut-0.45.0/clients/Makefile.in Mon Jul 2 12:11:29 2001 | |
f9d737f9 | 63 | @@ -1,11 +1,10 @@ |
64 | # Network UPS Tools: clients | |
65 | ||
66 | # directories | |
67 | -prefix = $(INSTALLROOT)@prefix@ | |
68 | -BASEPATH = $(prefix) | |
69 | -CGIPATH = $(INSTALLROOT)@CGIPATH@ | |
70 | -BINPATH = $(prefix)/@bindir@ | |
71 | -SBINPATH = $(prefix)/@sbindir@ | |
72 | +prefix = @prefix@ | |
73 | +CGIPATH = @CGIPATH@ | |
74 | +bindir = @bindir@ | |
75 | +sbindir = @sbindir@ | |
76 | ||
77 | # other definitions | |
78 | CC = @CC@ | |
79 | @@ -66,18 +65,17 @@ | |
bca7d0b3 | 80 | distclean: clean |
81 | ||
82 | install: all | |
f9d737f9 | 83 | + $(INSTALLCMD) -d $(DESTDIR)$(bindir) |
84 | + $(INSTALLCMD) -d $(DESTDIR)$(sbindir) | |
bca7d0b3 | 85 | @for f in $(PROGS) ; do \ |
f9d737f9 | 86 | - $(INSTALLCMD) -m $(INSTALLMODE) $$f $(BINPATH); \ |
87 | + $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(bindir); \ | |
88 | done | |
89 | @for f in $(SPROGS) ; do \ | |
90 | - $(INSTALLCMD) -m $(INSTALLMODE) $$f $(SBINPATH); \ | |
91 | + $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(sbindir); \ | |
bca7d0b3 | 92 | done |
93 | ||
94 | install-cgi: cgi | |
95 | + $(INSTALLCMD) -d $(DESTDIR)$(CGIPATH) | |
96 | @for f in $(CGIPROGS) ; do \ | |
97 | - $(INSTALLCMD) -m $(INSTALLMODE) $$f $(CGIPATH); \ | |
98 | + $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(CGIPATH); \ | |
99 | done | |
f9d737f9 | 100 | - |
101 | -install-misc: upsfetch.o | |
bca7d0b3 | 102 | - $(INSTALLCMD) upsfetch.h $(BASEPATH)/misc |
103 | - $(INSTALLCMD) upsfetch.o $(BASEPATH)/misc | |
4c47015d | 104 | diff -uNdr nut-0.45.0.old/conf/Makefile.in nut-0.45.0/conf/Makefile.in |
105 | --- nut-0.45.0.old/conf/Makefile.in Fri Jun 1 11:23:15 2001 | |
106 | +++ nut-0.45.0/conf/Makefile.in Mon Jul 2 12:28:20 2001 | |
107 | @@ -1,7 +1,7 @@ | |
bca7d0b3 | 108 | # Network UPS Tools: conf |
4c47015d | 109 | |
110 | prefix = @prefix@ | |
111 | -CONFPATH = $(INSTALLROOT)@sysconfdir@ | |
f9d737f9 | 112 | +sysconfdir = @sysconfdir@ |
bca7d0b3 | 113 | INSTALLCMD = @INSTALL@ |
114 | ||
4c47015d | 115 | SECFILES = upsmon.conf upsd.conf upsd.users |
116 | @@ -11,10 +11,11 @@ | |
bca7d0b3 | 117 | clean: |
118 | ||
119 | install: | |
f9d737f9 | 120 | + $(INSTALLCMD) -d $(DESTDIR)$(sysconfdir) |
bca7d0b3 | 121 | @for f in $(SECFILES) ; do \ |
4c47015d | 122 | - $(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \ |
79db239a | 123 | + $(INSTALLCMD) -m 0600 $$f $(DESTDIR)$(sysconfdir)/$$f; \ |
bca7d0b3 | 124 | done |
125 | ||
f9d737f9 | 126 | @for f in $(PUBFILES) ; do \ |
4c47015d | 127 | - $(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \ |
79db239a | 128 | + $(INSTALLCMD) -m 0644 $$f $(DESTDIR)$(sysconfdir)/$$f; \ |
bca7d0b3 | 129 | done |
4c47015d | 130 | diff -uNdr nut-0.45.0.old/man/Makefile.in nut-0.45.0/man/Makefile.in |
131 | --- nut-0.45.0.old/man/Makefile.in Tue Jan 23 22:01:15 2001 | |
132 | +++ nut-0.45.0/man/Makefile.in Mon Jul 2 12:17:53 2001 | |
133 | @@ -1,7 +1,7 @@ | |
134 | # Network UPS Tools: man | |
f9d737f9 | 135 | |
4c47015d | 136 | prefix = @prefix@ |
f9d737f9 | 137 | -MANDIR = $(INSTALLROOT)@mandir@ |
f9d737f9 | 138 | +mandir = @mandir@ |
139 | INSTALLCMD = @INSTALL@ | |
140 | INSTALLMODE = 0644 | |
141 | ||
142 | @@ -14,15 +14,7 @@ | |
143 | distclean: clean | |
144 | ||
145 | install: all | |
146 | - | |
147 | - @if (test ! -d $(MANDIR)) then \ | |
148 | - $(INSTALLCMD) -d $(MANDIR) || exit 1;\ | |
149 | - fi | |
150 | - | |
151 | - @if (test ! -d $(MANDIR)/man8) then \ | |
152 | - $(INSTALLCMD) -d $(MANDIR)/man8 || exit 1;\ | |
153 | - fi | |
154 | - | |
155 | + $(INSTALLCMD) -d $(DESTDIR)$(mandir)/man8 | |
156 | @for f in $(MAN8_PAGES) ; do \ | |
157 | - $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \ | |
158 | + $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(mandir)/man8; \ | |
159 | done | |
4c47015d | 160 | diff -uNdr nut-0.45.0.old/models/Makefile.in nut-0.45.0/models/Makefile.in |
161 | --- nut-0.45.0.old/models/Makefile.in Sun May 27 08:56:01 2001 | |
162 | +++ nut-0.45.0/models/Makefile.in Mon Jul 2 12:26:33 2001 | |
163 | @@ -1,7 +1,7 @@ | |
164 | # Network UPS Tools: models | |
165 | ||
166 | # directories | |
bca7d0b3 | 167 | -MODELPATH = $(INSTALLROOT)@MODELPATH@ |
168 | +MODELPATH = @MODELPATH@ | |
169 | ||
4c47015d | 170 | # other definitions |
171 | CC = @CC@ | |
172 | @@ -54,10 +54,8 @@ | |
bca7d0b3 | 173 | distclean: clean |
174 | ||
175 | install: all | |
176 | - if (test ! -d $(MODELPATH)) then \ | |
177 | - $(INSTALLCMD) -d $(MODELPATH) || exit 1; \ | |
178 | - fi | |
bca7d0b3 | 179 | + $(INSTALLCMD) -d $(DESTDIR)$(MODELPATH) |
4c47015d | 180 | |
181 | @for f in $(PROGS) $(PROGS2) ; do \ | |
bca7d0b3 | 182 | - $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MODELPATH); \ |
183 | + $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MODELPATH); \ | |
184 | done | |
4c47015d | 185 | diff -uNdr nut-0.45.0.old/server/Makefile.in nut-0.45.0/server/Makefile.in |
186 | --- nut-0.45.0.old/server/Makefile.in Thu Mar 29 00:52:47 2001 | |
187 | +++ nut-0.45.0/server/Makefile.in Mon Jul 2 12:20:57 2001 | |
188 | @@ -1,8 +1,8 @@ | |
189 | # Network UPS Tools: server | |
190 | ||
191 | # directories | |
192 | -prefix = $(INSTALLROOT)@prefix@ | |
f9d737f9 | 193 | -SBINPATH = $(prefix)/@sbindir@ |
4c47015d | 194 | +prefix = @prefix@ |
195 | +sbindir = @sbindir@ | |
196 | ||
197 | # other definitions | |
198 | CC = @CC@ | |
199 | @@ -32,6 +32,7 @@ | |
bca7d0b3 | 200 | distclean: clean |
201 | ||
202 | install: all | |
f9d737f9 | 203 | + $(INSTALLCMD) -d $(DESTDIR)$(sbindir) |
bca7d0b3 | 204 | @for f in $(PROGS) ; do \ |
f9d737f9 | 205 | - $(INSTALLCMD) $$f $(SBINPATH); \ |
206 | + $(INSTALLCMD) $$f $(DESTDIR)$(sbindir); \ | |
bca7d0b3 | 207 | done |