blob: 89b982062e3b3dd17c148d9a823748520ed47a49 (
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
|
diff -ur ../442/Makefile.in ./Makefile.in
--- ../442/Makefile.in Sat Dec 23 00:40:24 2000
+++ ./Makefile.in Thu Jan 4 11:25:54 2001
@@ -5,7 +5,7 @@
BASEPATH = $(INSTALLROOT)@prefix@
CONFPATH = $(INSTALLROOT)@sysconfdir@
CGIPATH = $(INSTALLROOT)@CGIPATH@
-INSTALLDIRS = $(CONFPATH) $(CGIPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@ $(BASEPATH)/misc
+INSTALLDIRS = $(CONFPATH) $(CGIPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@
STATEPATH = $(INSTALLROOT)@STATEPATH@
SUBDIRS = common models server clients man
Only in .: a
diff -ur ../442/conf/Makefile.in ./conf/Makefile.in
--- ../442/conf/Makefile.in Mon May 8 04:17:20 2000
+++ ./conf/Makefile.in Thu Jan 4 11:26:54 2001
@@ -13,17 +13,9 @@
install:
@for f in $(SECFILES) ; do \
- if [ -f $(CONFPATH)/$$f ]; then \
- echo "Preserving existing config file: $$f"; \
- else \
- $(INSTALLCMD) -m 0600 $$f $(CONFPATH); \
- fi; \
+ $(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \
done
@for f in $(PUBFILES) ; do \
- if [ -f $(CONFPATH)/$$f ]; then \
- echo "Preserving existing config file: $$f"; \
- else \
- $(INSTALLCMD) -m 0644 $$f $(CONFPATH); \
- fi; \
+ $(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \
done
diff -ur ../442/scripts/FreeBSD/upsd.sh.sample ./scripts/FreeBSD/upsd.sh.sample
--- ../442/scripts/FreeBSD/upsd.sh.sample Sun Jan 16 04:22:27 2000
+++ ./scripts/FreeBSD/upsd.sh.sample Thu Jan 4 11:51:18 2001
@@ -2,7 +2,9 @@
PREFIX=%%PREFIX%%
+BIN=${PREFIX}/bin
SBIN=${PREFIX}/sbin
+MODELS=${PREFIX}/libexec/nut
UPSTYPE="apcsmart"
UPSFLAGS=""
UPSDEV="/dev/cuaa3"
@@ -10,10 +12,10 @@
UPSLOGINTERVAL="300"
if [ x$1 = xstart ]; then
- ${SBIN}/$UPSTYPE $UPSFLAGS $UPSDEV
+ ${MODELS}/$UPSTYPE $UPSFLAGS $UPSDEV
${SBIN}/upsd
${SBIN}/upsmon localhost
- ${SBIN}/upslog localhost $UPSLOG $UPSLOGINTERVAL
+ ${BIN}/upslog localhost $UPSLOG $UPSLOGINTERVAL
elif [ "x$1" = "xstop" ]; then
/usr/bin/killall upslog upsmon upsd $UPSTYPE
fi
|
