[packages/nut.git] / nut-DESTDIR.patch

diff -urN nut-0.99.1.org/Makefile.in nut-0.99.1/Makefile.in
--- nut-0.99.1.org/Makefile.in	Tue Aug 13 18:57:38 2002
+++ nut-0.99.1/Makefile.in	Tue Aug 13 19:31:19 2002
@@ -2,13 +2,12 @@
 
 # directory definitions
 prefix      = @prefix@
-INSTALLROOT = $(DESTDIR)
-BASEPATH    = $(INSTALLROOT)@prefix@
-CONFPATH    = $(INSTALLROOT)@sysconfdir@
-CGIPATH     = $(INSTALLROOT)@CGIPATH@
-DRVPATH     = $(INSTALLROOT)@DRVPATH@
-INSTALLDIRS = $(CONFPATH) $(DRVPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@
-STATEPATH   = $(INSTALLROOT)@STATEPATH@
+BASEPATH    = @prefix@
+CONFPATH    = @sysconfdir@
+CGIPATH     = @CGIPATH@
+DRVPATH     = @DRVPATH@
+INSTALLDIRS = $(CONFPATH) $(DRVPATH) @bindir@ @sbindir@
+STATEPATH   = @STATEPATH@
 
 SUBDIRS	= common drivers server clients
 CFLAGS	= -I../include @CFLAGS@
@@ -44,7 +43,7 @@
 	done
 
 install: install-dirs install-man
-	@echo Installing in $(BASEPATH)...
+	@echo Installing in $(DESTDIR)$(BASEPATH)...
 
 	@for i in $(SUBDIRS) conf; do \
 		cd $$i; $(MAKE) install; cd ..; \
@@ -52,15 +51,15 @@
 
 install-dirs:
 	@for d in $(INSTALLDIRS); do \
-		if (test ! -d $$d) then \
-			./install-sh -d $$d || exit 1; \
+		if (test ! -d $(DESTDIR)$$d) then \
+			./install-sh -d $(DESTDIR)$$d || exit 1; \
 		fi \
 	done
 
-	@if (test ! -d $(STATEPATH)) then \
-		./install-sh -d -m $(STATEPATHMODE) $(STATEPATH) || exit 1 ; \
-		./install-sh -d -o $(RUNUID) -g $(RUNGID) $(STATEPATH) \
-		|| echo "Unable to set ownership of $(STATEPATH)"; \
+	@if (test ! -d $(DESTDIR)$(STATEPATH)) then \
+		./install-sh -d -m $(STATEPATHMODE) $(DESTDIR)$(STATEPATH) || exit 1 ; \
+		./install-sh -d -o $(RUNUID) -g $(RUNGID) $(DESTDIR)$(STATEPATH) \
+		|| echo "Unable to set ownership of $(DESTDIR)$(STATEPATH)"; \
 	fi
 
 install-man:
@@ -77,8 +76,8 @@
 	@cd clients; $(MAKE) cgi; cd ..;
 
 install-cgi: install-dirs install-cgi-man
-	if (test ! -d $(CGIPATH)) then \
-		./install-sh -d $(CGIPATH) || exit 1; \
+	if (test ! -d $(DESTDIR)$(CGIPATH)) then \
+		./install-sh -d $(DESTDIR)$(CGIPATH) || exit 1; \
 	fi \
 
 	@cd conf; $(MAKE) install; cd ..;
diff -urN nut-0.99.1.org/clients/Makefile.in nut-0.99.1/clients/Makefile.in
--- nut-0.99.1.org/clients/Makefile.in	Tue Aug 13 18:57:38 2002
+++ nut-0.99.1/clients/Makefile.in	Tue Aug 13 19:29:22 2002
@@ -1,12 +1,10 @@
 # Network UPS Tools: clients
 
 # directories
-INSTALLROOT = $(DESTDIR)
-prefix	 = $(INSTALLROOT)@prefix@
-BASEPATH = $(prefix)
-CGIPATH	 = $(INSTALLROOT)@CGIPATH@
-BINPATH	 = $(prefix)/@bindir@
-SBINPATH = $(prefix)/@sbindir@
+prefix	 = @prefix@
+CGIPATH	 = @CGIPATH@
+BINPATH	 = @bindir@
+SBINPATH = @sbindir@
 
 # other definitions
 CC	 = @CC@
@@ -69,20 +67,20 @@
 
 install: all
 	@for f in $(PROGS) ; do \
-		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(BINPATH); \
+		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(BINPATH); \
 	done
 	@for f in $(SPROGS) ; do \
-		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(SBINPATH); \
+		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(SBINPATH); \
 	done
 
 install-cgi: cgi
 	@for f in $(CGIPROGS) ; do \
-		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(CGIPATH); \
+		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(CGIPATH); \
 	done
 
 install-misc: upsfetch.o
-	@if (test ! -d $(BASEPATH)/misc) then \
-		../install-sh -d $(BASEPATH)/misc || exit 1; \
+	@if (test ! -d $(prefix)/misc) then \
+		../install-sh -d $(prefix)/misc || exit 1; \
 	fi
-	$(INSTALLCMD) upsfetch.h $(BASEPATH)/misc
-	$(INSTALLCMD) upsfetch.o $(BASEPATH)/misc
+	$(INSTALLCMD) upsfetch.h $(prefix)/misc
+	$(INSTALLCMD) upsfetch.o $(prefix)/misc
diff -urN nut-0.99.1.org/conf/Makefile.in nut-0.99.1/conf/Makefile.in
--- nut-0.99.1.org/conf/Makefile.in	Tue Aug 13 18:57:38 2002
+++ nut-0.99.1/conf/Makefile.in	Tue Aug 13 19:29:22 2002
@@ -3,8 +3,7 @@
 # this gets used once configure expands sysconfdir below...
 prefix      = @prefix@
 
-INSTALLROOT = $(DESTDIR)
-CONFPATH    = $(INSTALLROOT)@sysconfdir@
+CONFPATH    = @sysconfdir@
 INSTALLCMD  = @INSTALL@
 
 SECFILES = upsmon.conf upsd.conf upsd.users
@@ -15,9 +14,9 @@
 
 install:
 	@for f in $(SECFILES) ; do \
-		$(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \
+		$(INSTALLCMD) -m 0600 $$f $(DESTDIR)$(CONFPATH)/$$f.sample; \
 	done
 
 	@for f in $(PUBFILES) ; do \
-		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \
+		$(INSTALLCMD) -m 0644 $$f $(DESTDIR)$(CONFPATH)/$$f.sample; \
 	done
diff -urN nut-0.99.1.org/drivers/Makefile.in nut-0.99.1/drivers/Makefile.in
--- nut-0.99.1.org/drivers/Makefile.in	Tue Aug 13 18:57:38 2002
+++ nut-0.99.1/drivers/Makefile.in	Tue Aug 13 19:29:22 2002
@@ -1,8 +1,7 @@
 # Network UPS Tools: drivers
 
 # directories
-INSTALLROOT = $(DESTDIR)
-DRVPATH = $(INSTALLROOT)@DRVPATH@
+DRVPATH = @DRVPATH@
 
 # other definitions
 CC	= @CC@
@@ -106,20 +105,20 @@
 # Install handlers
 
 install: all install-@DRIVER_INSTALL_TARGET@
-	$(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(DRVPATH);
+	$(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(DESTDIR)$(DRVPATH);
 
 # Install every driver
 
 install-all-drivers:
 	@for f in $(PROGS) ; do \
-		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DRVPATH); \
-		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DRVPATH); \
+		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(DRVPATH); \
+		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(DRVPATH); \
 	done
 
 # Just install the drivers that were selected by the user
 
 install-some-drivers:
 	@for f in $(DRIVER_BUILD_LIST) ; do \
-		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DRVLPATH); \
-		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DRVPATH); \
+		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(DRVLPATH); \
+		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(DRVPATH); \
 	done
diff -urN nut-0.99.1.org/man/Makefile.in nut-0.99.1/man/Makefile.in
--- nut-0.99.1.org/man/Makefile.in	Tue Aug 13 18:57:38 2002
+++ nut-0.99.1/man/Makefile.in	Tue Aug 13 19:29:22 2002
@@ -1,8 +1,7 @@
 # Network UPS Tools: man
 
-INSTALLROOT = $(DESTDIR)
 prefix      = @prefix@
-MANDIR      = $(INSTALLROOT)@mandir@
+MANDIR      = @mandir@
 INSTALLCMD  = @INSTALL@
 INSTALLMODE = 0644
 
@@ -34,35 +33,35 @@
 
 install: all install-man-dirs @DRIVER_INSTALL_TARGET@
 	@for f in $(MAN5_PAGES) ; do \
-		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man5; \
-		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man5; \
+		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man5; \
+		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man5; \
 	done
 	@for f in $(MAN8_PAGES) ; do \
-		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
-		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
+		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
+		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
 	done
 
 # make the directories for these things
 
 install-man-dirs:
 	@if (test ! -d $(MANDIR)) then \
-		echo ../install-sh -d $(MANDIR) || exit 1;\
-		../install-sh -d $(MANDIR) || exit 1;\
+		echo ../install-sh -d $(DESTDIR)$(MANDIR) || exit 1;\
+		../install-sh -d $(DESTDIR)$(MANDIR) || exit 1;\
 	fi
-	@if (test ! -d $(MANDIR)/man5) then \
-		echo ../install-sh -d $(MANDIR)/man5 || exit 1;\
-		../install-sh -d $(MANDIR)/man5 || exit 1;\
+	@if (test ! -d $(DESTDIR)$(MANDIR)/man5) then \
+		echo ../install-sh -d $(DESTDIR)$(MANDIR)/man5 || exit 1;\
+		../install-sh -d $(DESTDIR)$(MANDIR)/man5 || exit 1;\
 	fi
-	@if (test ! -d $(MANDIR)/man8) then \
-		echo ../install-sh -d $(MANDIR)/man8 || exit 1;\
-		../install-sh -d $(MANDIR)/man8 || exit 1;\
+	@if (test ! -d $(DESTDIR)$(MANDIR)/man8) then \
+		echo ../install-sh -d $(DESTDIR)$(MANDIR)/man8 || exit 1;\
+		../install-sh -d $(DESTDIR)$(MANDIR)/man8 || exit 1;\
 	fi
 
 # install every driver man page
 all-drivers:
 	@for f in $(DRIVERPAGES) ; do \
-		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
-		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
+		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
+		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
 	done
 
 # install just the pages for the drivers that were built
@@ -70,19 +69,19 @@
 	@for f in $(DRIVER_BUILD_LIST) ; do \
 		if (test -f $$f.8) \
 		then \
-			echo $(INSTALLCMD) -m $(INSTALLMODE) $$f.8 $(MANDIR)/man8; \
-			$(INSTALLCMD) -m $(INSTALLMODE) $$f.8 $(MANDIR)/man8; \
+			echo $(INSTALLCMD) -m $(INSTALLMODE) $$f.8 $(DESTDIR)$(MANDIR)/man8; \
+			$(INSTALLCMD) -m $(INSTALLMODE) $$f.8 $(DESTDIR)$(MANDIR)/man8; \
 		fi \
 	done
 
 # just the CGI program man pages
 install-cgi-man: install-man-dirs
 	@for f in $(CGI_MAN5) ; do \
-		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man5; \
-		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man5; \
+		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man5; \
+		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man5; \
 	done
 
 	@for f in $(CGI_MAN8) ; do \
-		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
-		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
+		echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
+		$(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
 	done
diff -urN nut-0.99.1.org/server/Makefile.in nut-0.99.1/server/Makefile.in
--- nut-0.99.1.org/server/Makefile.in	Tue Aug 13 18:57:38 2002
+++ nut-0.99.1/server/Makefile.in	Tue Aug 13 19:29:22 2002
@@ -1,9 +1,8 @@
 # Network UPS Tools: server
 
 # directories
-INSTALLROOT = $(DESTDIR)
-prefix   = $(INSTALLROOT)@prefix@
-SBINPATH = $(prefix)@sbindir@
+prefix   = @prefix@
+SBINPATH = @sbindir@
 
 # other definitions
 CC	= @CC@
@@ -31,6 +30,6 @@
 
 install: all
 	@for f in $(PROGS) ; do \
-		echo $(INSTALLCMD) $$f $(SBINPATH); \
-		$(INSTALLCMD) $$f $(SBINPATH); \
+		echo $(INSTALLCMD) $$f $(DESTDIR)$(SBINPATH); \
+		$(INSTALLCMD) $$f $(DESTDIR)$(SBINPATH); \
 	done
Commit	Line	Data
bb94ceb4 AM	1	diff -urN nut-0.99.1.org/Makefile.in nut-0.99.1/Makefile.in
	2	--- nut-0.99.1.org/Makefile.in Tue Aug 13 18:57:38 2002
	3	+++ nut-0.99.1/Makefile.in Tue Aug 13 19:31:19 2002
	4	@@ -2,13 +2,12 @@
bca7d0b3	5
bca7d0b3	6	# directory definitions
f9d737f9	7	prefix = @prefix@
bb94ceb4	8	-INSTALLROOT = $(DESTDIR)
f9d737f9	9	-BASEPATH = $(INSTALLROOT)@prefix@
	10	-CONFPATH = $(INSTALLROOT)@sysconfdir@
	11	-CGIPATH = $(INSTALLROOT)@CGIPATH@
bb94ceb4 AM	12	-DRVPATH = $(INSTALLROOT)@DRVPATH@
bb94ceb4 AM	13	-INSTALLDIRS = $(CONFPATH) $(DRVPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@
f9d737f9	14	-STATEPATH = $(INSTALLROOT)@STATEPATH@
bb94ceb4 AM	15	+BASEPATH = @prefix@
	16	+CONFPATH = @sysconfdir@
	17	+CGIPATH = @CGIPATH@
	18	+DRVPATH = @DRVPATH@
	19	+INSTALLDIRS = $(CONFPATH) $(DRVPATH) @bindir@ @sbindir@
	20	+STATEPATH = @STATEPATH@
f9d737f9	21
bb94ceb4 AM	22	SUBDIRS = common drivers server clients
	23	CFLAGS = -I../include @CFLAGS@
	24	@@ -44,7 +43,7 @@
2ac565e6	25	done
2ac565e6	26
bb94ceb4	27	install: install-dirs install-man
2ac565e6	28	- @echo Installing in $(BASEPATH)...
bb94ceb4 AM	29	+ @echo Installing in $(DESTDIR)$(BASEPATH)...
bb94ceb4 AM	30
bca7d0b3	31	@for i in $(SUBDIRS) conf; do \
bb94ceb4 AM	32	cd $$i; $(MAKE) install; cd ..; \
	33	@@ -52,15 +51,15 @@
	34
	35	install-dirs:
	36	@for d in $(INSTALLDIRS); do \
2ac565e6	37	- if (test ! -d $$d) then \
2ac565e6	38	- ./install-sh -d $$d \|\| exit 1; \
bb94ceb4 AM	39	+ if (test ! -d $(DESTDIR)$$d) then \
	40	+ ./install-sh -d $(DESTDIR)$$d \|\| exit 1; \
	41	fi \
4c47015d	42	done
4c47015d	43
2ac565e6	44	- @if (test ! -d $(STATEPATH)) then \
bb94ceb4	45	- ./install-sh -d -m $(STATEPATHMODE) $(STATEPATH) \|\| exit 1 ; \
2ac565e6	46	- ./install-sh -d -o $(RUNUID) -g $(RUNGID) $(STATEPATH) \
2ac565e6	47	- \|\| echo "Unable to set ownership of $(STATEPATH)"; \
bb94ceb4 AM	48	+ @if (test ! -d $(DESTDIR)$(STATEPATH)) then \
	49	+ ./install-sh -d -m $(STATEPATHMODE) $(DESTDIR)$(STATEPATH) \|\| exit 1 ; \
	50	+ ./install-sh -d -o $(RUNUID) -g $(RUNGID) $(DESTDIR)$(STATEPATH) \
	51	+ \|\| echo "Unable to set ownership of $(DESTDIR)$(STATEPATH)"; \
	52	fi
	53
	54	install-man:
	55	@@ -77,8 +76,8 @@
bca7d0b3	56	@cd clients; $(MAKE) cgi; cd ..;
bca7d0b3	57
bb94ceb4	58	install-cgi: install-dirs install-cgi-man
2ac565e6	59	- if (test ! -d $(CGIPATH)) then \
2ac565e6	60	- ./install-sh -d $(CGIPATH) \|\| exit 1; \
bb94ceb4 AM	61	+ if (test ! -d $(DESTDIR)$(CGIPATH)) then \
	62	+ ./install-sh -d $(DESTDIR)$(CGIPATH) \|\| exit 1; \
	63	fi \
	64
	65	@cd conf; $(MAKE) install; cd ..;
	66	diff -urN nut-0.99.1.org/clients/Makefile.in nut-0.99.1/clients/Makefile.in
	67	--- nut-0.99.1.org/clients/Makefile.in Tue Aug 13 18:57:38 2002
	68	+++ nut-0.99.1/clients/Makefile.in Tue Aug 13 19:29:22 2002
	69	@@ -1,12 +1,10 @@
f9d737f9	70	# Network UPS Tools: clients
	71
	72	# directories
bb94ceb4	73	-INSTALLROOT = $(DESTDIR)
f9d737f9	74	-prefix = $(INSTALLROOT)@prefix@
	75	-BASEPATH = $(prefix)
	76	-CGIPATH = $(INSTALLROOT)@CGIPATH@
	77	-BINPATH = $(prefix)/@bindir@
	78	-SBINPATH = $(prefix)/@sbindir@
	79	+prefix = @prefix@
	80	+CGIPATH = @CGIPATH@
bb94ceb4 AM	81	+BINPATH = @bindir@
bb94ceb4 AM	82	+SBINPATH = @sbindir@
f9d737f9	83
	84	# other definitions
	85	CC = @CC@
bb94ceb4	86	@@ -69,20 +67,20 @@
bca7d0b3	87
bca7d0b3	88	install: all
bb94ceb4	89	@for f in $(PROGS) ; do \
f9d737f9	90	- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(BINPATH); \
bb94ceb4 AM	91	+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(BINPATH); \
	92	done
	93	@for f in $(SPROGS) ; do \
f9d737f9	94	- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(SBINPATH); \
bb94ceb4 AM	95	+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(SBINPATH); \
	96	done
	97
	98	install-cgi: cgi
	99	@for f in $(CGIPROGS) ; do \
bca7d0b3	100	- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(CGIPATH); \
bb94ceb4 AM	101	+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(CGIPATH); \
	102	done
	103
	104	install-misc: upsfetch.o
2ac565e6	105	- @if (test ! -d $(BASEPATH)/misc) then \
2ac565e6	106	- ../install-sh -d $(BASEPATH)/misc \|\| exit 1; \
bb94ceb4 AM	107	+ @if (test ! -d $(prefix)/misc) then \
	108	+ ../install-sh -d $(prefix)/misc \|\| exit 1; \
	109	fi
bca7d0b3	110	- $(INSTALLCMD) upsfetch.h $(BASEPATH)/misc
bca7d0b3	111	- $(INSTALLCMD) upsfetch.o $(BASEPATH)/misc
bb94ceb4 AM	112	+ $(INSTALLCMD) upsfetch.h $(prefix)/misc
	113	+ $(INSTALLCMD) upsfetch.o $(prefix)/misc
	114	diff -urN nut-0.99.1.org/conf/Makefile.in nut-0.99.1/conf/Makefile.in
	115	--- nut-0.99.1.org/conf/Makefile.in Tue Aug 13 18:57:38 2002
	116	+++ nut-0.99.1/conf/Makefile.in Tue Aug 13 19:29:22 2002
	117	@@ -3,8 +3,7 @@
	118	# this gets used once configure expands sysconfdir below...
	119	prefix = @prefix@
	120
	121	-INSTALLROOT = $(DESTDIR)
	122	-CONFPATH = $(INSTALLROOT)@sysconfdir@
	123	+CONFPATH = @sysconfdir@
	124	INSTALLCMD = @INSTALL@
bca7d0b3	125
4c47015d	126	SECFILES = upsmon.conf upsd.conf upsd.users
bb94ceb4	127	@@ -15,9 +14,9 @@
bca7d0b3	128
bca7d0b3	129	install:
bca7d0b3	130	@for f in $(SECFILES) ; do \
4c47015d	131	- $(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \
bb94ceb4	132	+ $(INSTALLCMD) -m 0600 $$f $(DESTDIR)$(CONFPATH)/$$f.sample; \
bca7d0b3	133	done
bca7d0b3	134
f9d737f9	135	@for f in $(PUBFILES) ; do \
4c47015d	136	- $(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \
bb94ceb4	137	+ $(INSTALLCMD) -m 0644 $$f $(DESTDIR)$(CONFPATH)/$$f.sample; \
bca7d0b3	138	done
bb94ceb4 AM	139	diff -urN nut-0.99.1.org/drivers/Makefile.in nut-0.99.1/drivers/Makefile.in
	140	--- nut-0.99.1.org/drivers/Makefile.in Tue Aug 13 18:57:38 2002
	141	+++ nut-0.99.1/drivers/Makefile.in Tue Aug 13 19:29:22 2002
	142	@@ -1,8 +1,7 @@
	143	# Network UPS Tools: drivers
	144
	145	# directories
	146	-INSTALLROOT = $(DESTDIR)
	147	-DRVPATH = $(INSTALLROOT)@DRVPATH@
	148	+DRVPATH = @DRVPATH@
	149
	150	# other definitions
	151	CC = @CC@
	152	@@ -106,20 +105,20 @@
	153	# Install handlers
	154
	155	install: all install-@DRIVER_INSTALL_TARGET@
	156	- $(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(DRVPATH);
	157	+ $(INSTALLCMD) -m $(INSTALLMODE) upsdrvctl $(DESTDIR)$(DRVPATH);
	158
	159	# Install every driver
	160
	161	install-all-drivers:
	162	@for f in $(PROGS) ; do \
	163	- echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DRVPATH); \
	164	- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DRVPATH); \
	165	+ echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(DRVPATH); \
	166	+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(DRVPATH); \
	167	done
	168
	169	# Just install the drivers that were selected by the user
	170
	171	install-some-drivers:
	172	@for f in $(DRIVER_BUILD_LIST) ; do \
	173	- echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DRVLPATH); \
	174	- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DRVPATH); \
	175	+ echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(DRVLPATH); \
	176	+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(DRVPATH); \
	177	done
	178	diff -urN nut-0.99.1.org/man/Makefile.in nut-0.99.1/man/Makefile.in
	179	--- nut-0.99.1.org/man/Makefile.in Tue Aug 13 18:57:38 2002
	180	+++ nut-0.99.1/man/Makefile.in Tue Aug 13 19:29:22 2002
	181	@@ -1,8 +1,7 @@
4c47015d	182	# Network UPS Tools: man
f9d737f9	183
bb94ceb4	184	-INSTALLROOT = $(DESTDIR)
4c47015d	185	prefix = @prefix@
f9d737f9	186	-MANDIR = $(INSTALLROOT)@mandir@
bb94ceb4	187	+MANDIR = @mandir@
f9d737f9	188	INSTALLCMD = @INSTALL@
	189	INSTALLMODE = 0644
	190
bb94ceb4	191	@@ -34,35 +33,35 @@
f9d737f9	192
bb94ceb4 AM	193	install: all install-man-dirs @DRIVER_INSTALL_TARGET@
bb94ceb4 AM	194	@for f in $(MAN5_PAGES) ; do \
2ac565e6	195	- echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man5; \
2ac565e6	196	- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man5; \
bb94ceb4 AM	197	+ echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man5; \
	198	+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man5; \
	199	done
	200	@for f in $(MAN8_PAGES) ; do \
2ac565e6	201	- echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
2ac565e6	202	- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
bb94ceb4 AM	203	+ echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
	204	+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
	205	done
	206
	207	# make the directories for these things
	208
	209	install-man-dirs:
	210	@if (test ! -d $(MANDIR)) then \
2ac565e6	211	- echo ../install-sh -d $(MANDIR) \|\| exit 1;\
608caf3a	212	- ../install-sh -d $(MANDIR) \|\| exit 1;\
bb94ceb4 AM	213	+ echo ../install-sh -d $(DESTDIR)$(MANDIR) \|\| exit 1;\
	214	+ ../install-sh -d $(DESTDIR)$(MANDIR) \|\| exit 1;\
	215	fi
0fb118d7	216	- @if (test ! -d $(MANDIR)/man5) then \
2ac565e6	217	- echo ../install-sh -d $(MANDIR)/man5 \|\| exit 1;\
0fb118d7	218	- ../install-sh -d $(MANDIR)/man5 \|\| exit 1;\
bb94ceb4 AM	219	+ @if (test ! -d $(DESTDIR)$(MANDIR)/man5) then \
	220	+ echo ../install-sh -d $(DESTDIR)$(MANDIR)/man5 \|\| exit 1;\
	221	+ ../install-sh -d $(DESTDIR)$(MANDIR)/man5 \|\| exit 1;\
	222	fi
f9d737f9	223	- @if (test ! -d $(MANDIR)/man8) then \
2ac565e6	224	- echo ../install-sh -d $(MANDIR)/man8 \|\| exit 1;\
608caf3a	225	- ../install-sh -d $(MANDIR)/man8 \|\| exit 1;\
bb94ceb4 AM	226	+ @if (test ! -d $(DESTDIR)$(MANDIR)/man8) then \
	227	+ echo ../install-sh -d $(DESTDIR)$(MANDIR)/man8 \|\| exit 1;\
	228	+ ../install-sh -d $(DESTDIR)$(MANDIR)/man8 \|\| exit 1;\
	229	fi
	230
	231	# install every driver man page
	232	all-drivers:
	233	@for f in $(DRIVERPAGES) ; do \
2ac565e6	234	- echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
2ac565e6	235	- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
bb94ceb4 AM	236	+ echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
	237	+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
	238	done
	239
	240	# install just the pages for the drivers that were built
	241	@@ -70,19 +69,19 @@
	242	@for f in $(DRIVER_BUILD_LIST) ; do \
	243	if (test -f $$f.8) \
	244	then \
2ac565e6	245	- echo $(INSTALLCMD) -m $(INSTALLMODE) $$f.8 $(MANDIR)/man8; \
2ac565e6	246	- $(INSTALLCMD) -m $(INSTALLMODE) $$f.8 $(MANDIR)/man8; \
bb94ceb4 AM	247	+ echo $(INSTALLCMD) -m $(INSTALLMODE) $$f.8 $(DESTDIR)$(MANDIR)/man8; \
	248	+ $(INSTALLCMD) -m $(INSTALLMODE) $$f.8 $(DESTDIR)$(MANDIR)/man8; \
	249	fi \
	250	done
	251
	252	# just the CGI program man pages
	253	install-cgi-man: install-man-dirs
	254	@for f in $(CGI_MAN5) ; do \
2ac565e6	255	- echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man5; \
0fb118d7	256	- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man5; \
bb94ceb4 AM	257	+ echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man5; \
	258	+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man5; \
	259	done
	260
	261	@for f in $(CGI_MAN8) ; do \
2ac565e6	262	- echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
f9d737f9	263	- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MANDIR)/man8; \
bb94ceb4 AM	264	+ echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
	265	+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
	266	done
	267	diff -urN nut-0.99.1.org/server/Makefile.in nut-0.99.1/server/Makefile.in
	268	--- nut-0.99.1.org/server/Makefile.in Tue Aug 13 18:57:38 2002
	269	+++ nut-0.99.1/server/Makefile.in Tue Aug 13 19:29:22 2002
	270	@@ -1,9 +1,8 @@
4c47015d	271	# Network UPS Tools: server
	272
	273	# directories
bb94ceb4	274	-INSTALLROOT = $(DESTDIR)
4c47015d	275	-prefix = $(INSTALLROOT)@prefix@
2ac565e6	276	-SBINPATH = $(prefix)@sbindir@
4c47015d	277	+prefix = @prefix@
bb94ceb4	278	+SBINPATH = @sbindir@
4c47015d	279
	280	# other definitions
	281	CC = @CC@
bb94ceb4	282	@@ -31,6 +30,6 @@
bca7d0b3	283
bca7d0b3	284	install: all
bb94ceb4	285	@for f in $(PROGS) ; do \
2ac565e6	286	- echo $(INSTALLCMD) $$f $(SBINPATH); \
f9d737f9	287	- $(INSTALLCMD) $$f $(SBINPATH); \
bb94ceb4 AM	288	+ echo $(INSTALLCMD) $$f $(DESTDIR)$(SBINPATH); \
	289	+ $(INSTALLCMD) $$f $(DESTDIR)$(SBINPATH); \
	290	done