---- nut-0.45.1/Makefile.in.orig Thu Aug 9 18:52:31 2001
-+++ nut-0.45.1/Makefile.in Tue Aug 21 20:40:19 2001
-@@ -2,11 +2,10 @@
+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@
--INSTALLDIRS = $(CONFPATH) $(CGIPATH) $(MODELPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@ $(BASEPATH)/misc
+-DRVPATH = $(INSTALLROOT)@DRVPATH@
+-INSTALLDIRS = $(CONFPATH) $(DRVPATH) $(BASEPATH)/@bindir@ $(BASEPATH)/@sbindir@
-STATEPATH = $(INSTALLROOT)@STATEPATH@
-+prefix = @prefix@
-+sysconfdir = @sysconfdir@
++BASEPATH = @prefix@
++CONFPATH = @sysconfdir@
+CGIPATH = @CGIPATH@
++DRVPATH = @DRVPATH@
++INSTALLDIRS = $(CONFPATH) $(DRVPATH) @bindir@ @sbindir@
+STATEPATH = @STATEPATH@
- SUBDIRS = common models server clients man
+ SUBDIRS = common drivers server clients
CFLAGS = -I../include @CFLAGS@
@@ -44,7 +43,7 @@
- @echo Installing in $(BASEPATH)...
+ 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 ..; \
-+ cd $$i; $(MAKE) DESTDIR=$(DESTDIR) install; cd ..; \
- done
+ cd $$i; $(MAKE) install; cd ..; \
+@@ -52,15 +51,15 @@
install-dirs:
-@@ -54,7 +54,7 @@
+ @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 -o $(RUNUID) -g $(RUNGID) $(STATEPATH) || exit 1; \
-+ ./install-sh -d $(DESTDIR)$(STATEPATH) || exit 1; \
+- @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
- cgi:
-@@ -62,11 +61,11 @@
+ install-man:
+@@ -77,8 +76,8 @@
@cd clients; $(MAKE) cgi; cd ..;
- install-cgi: install-dirs
-- @cd conf; $(MAKE) install; cd ..;
-- @cd clients; $(MAKE) install-cgi; cd ..;
-+ @cd conf; $(MAKE) DESTDIR=$(DESTDIR) install; cd ..;
-+ @cd clients; $(MAKE) DESTDIR=$(DESTDIR) install-cgi; cd ..;
-
- install-misc: install-dirs
-- @cd clients; $(MAKE) install-misc; cd ..;
-+ @cd clients; $(MAKE) DESTDIR=$(DESTDIR) install-misc; cd ..;
-
- # This is only used to set the "official" version before it goes out the door.
- #
-diff -uNdr nut-0.45.0.old/clients/Makefile.in nut-0.45.0/clients/Makefile.in
---- nut-0.45.0.old/clients/Makefile.in Thu Feb 1 06:02:53 2001
-+++ nut-0.45.0/clients/Makefile.in Mon Jul 2 12:11:29 2001
-@@ -1,11 +1,10 @@
+ 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@
-SBINPATH = $(prefix)/@sbindir@
+prefix = @prefix@
+CGIPATH = @CGIPATH@
-+bindir = @bindir@
-+sbindir = @sbindir@
++BINPATH = @bindir@
++SBINPATH = @sbindir@
# other definitions
CC = @CC@
-@@ -66,18 +65,17 @@
- distclean: clean
+@@ -69,20 +67,20 @@
install: all
-+ $(INSTALLCMD) -d $(DESTDIR)$(bindir)
-+ $(INSTALLCMD) -d $(DESTDIR)$(sbindir)
@for f in $(PROGS) ; do \
- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(BINPATH); \
-+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(bindir); \
++ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(BINPATH); \
done
@for f in $(SPROGS) ; do \
- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(SBINPATH); \
-+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(sbindir); \
++ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(SBINPATH); \
done
install-cgi: cgi
-+ $(INSTALLCMD) -d $(DESTDIR)$(CGIPATH)
@for f in $(CGIPROGS) ; do \
- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(CGIPATH); \
+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(CGIPATH); \
done
--
--install-misc: upsfetch.o
+
+ 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
-diff -uNdr nut-0.45.0.old/conf/Makefile.in nut-0.45.0/conf/Makefile.in
---- nut-0.45.0.old/conf/Makefile.in Fri Jun 1 11:23:15 2001
-+++ nut-0.45.0/conf/Makefile.in Mon Jul 2 12:28:20 2001
-@@ -1,7 +1,7 @@
- # Network UPS Tools: conf
++ $(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@
- prefix = @prefix@
--CONFPATH = $(INSTALLROOT)@sysconfdir@
-+sysconfdir = @sysconfdir@
- INSTALLCMD = @INSTALL@
+-INSTALLROOT = $(DESTDIR)
+-CONFPATH = $(INSTALLROOT)@sysconfdir@
++CONFPATH = @sysconfdir@
+ INSTALLCMD = @INSTALL@
SECFILES = upsmon.conf upsd.conf upsd.users
-@@ -11,10 +11,11 @@
- clean:
+@@ -15,9 +14,9 @@
install:
-+ $(INSTALLCMD) -d $(DESTDIR)$(sysconfdir)
@for f in $(SECFILES) ; do \
- $(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \
-+ $(INSTALLCMD) -m 0600 $$f $(DESTDIR)$(sysconfdir)/$$f; \
++ $(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)$(sysconfdir)/$$f; \
++ $(INSTALLCMD) -m 0644 $$f $(DESTDIR)$(CONFPATH)/$$f.sample; \
done
---- nut-0.45.1/man/Makefile.in.orig Wed Jul 25 09:10:09 2001
-+++ nut-0.45.1/man/Makefile.in Wed Aug 15 21:23:09 2001
-@@ -1,7 +1,7 @@
+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@
++MANDIR = @mandir@
INSTALLCMD = @INSTALL@
INSTALLMODE = 0644
-@@ -14,15 +14,7 @@
- distclean: clean
+@@ -34,35 +33,35 @@
- install: all
--
-- @if (test ! -d $(MANDIR)) then \
+ 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;\
-- fi
--
++ 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;\
-- fi
--
-+ $(INSTALLCMD) -d $(DESTDIR)$(mandir)/man8
- @for f in $(MAN8_PAGES) ; do \
++ @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; \
-+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(mandir)/man8; \
++ echo $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
++ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MANDIR)/man8; \
done
-diff -uNdr nut-0.45.0.old/server/Makefile.in nut-0.45.0/server/Makefile.in
---- nut-0.45.0.old/server/Makefile.in Thu Mar 29 00:52:47 2001
-+++ nut-0.45.0/server/Makefile.in Mon Jul 2 12:20:57 2001
-@@ -1,8 +1,8 @@
+
+ # 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@
+-SBINPATH = $(prefix)@sbindir@
+prefix = @prefix@
-+sbindir = @sbindir@
++SBINPATH = @sbindir@
# other definitions
CC = @CC@
-@@ -32,6 +32,7 @@
- distclean: clean
+@@ -31,6 +30,6 @@
install: all
-+ $(INSTALLCMD) -d $(DESTDIR)$(sbindir)
@for f in $(PROGS) ; do \
+- echo $(INSTALLCMD) $$f $(SBINPATH); \
- $(INSTALLCMD) $$f $(SBINPATH); \
-+ $(INSTALLCMD) $$f $(DESTDIR)$(sbindir); \
- done
---- nut-0.45.1/models/Makefile.in~ Sun Aug 5 16:59:34 2001
-+++ nut-0.45.1/models/Makefile.in Wed Aug 22 02:24:21 2001
-@@ -85,6 +85,7 @@
- distclean: clean
-
- install: all
-+ $(INSTALLCMD) -d $(DESTDIR)$(MODELPATH)
- @for f in $(PROGS) $(PROGS2) upsdrvctl ; do \
-- $(INSTALLCMD) -m $(INSTALLMODE) $$f $(MODELPATH); \
-+ $(INSTALLCMD) -m $(INSTALLMODE) $$f $(DESTDIR)$(MODELPATH); \
++ echo $(INSTALLCMD) $$f $(DESTDIR)$(SBINPATH); \
++ $(INSTALLCMD) $$f $(DESTDIR)$(SBINPATH); \
done
projects / packages / nut.git / blobdiff