--- nut-2.0.5/conf/Makefile.in.alt-makefile	2007-07-27 13:32:02 +0400

+++ nut-2.0.5/conf/Makefile.in	2007-07-27 13:32:04 +0400

@@ -17,14 +17,14 @@ clean:

 install:

 	@for f in $(SECFILES) ; do \

-		$(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f.sample; \

+		$(INSTALLCMD) -m 0600 $$f $(CONFPATH)/$$f; \

 	done

 	@for f in $(PUBFILES) ; do \

-		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \

+		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f; \

 	done

 install-cgi-conf:

 	@for f in $(CGIPUB) ; do \

-		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f.sample; \

+		$(INSTALLCMD) -m 0644 $$f $(CONFPATH)/$$f; \

 	done

--- nut-2.0.5/drivers/Makefile.in.alt-makefile	2007-07-27 13:32:02 +0400

+++ nut-2.0.5/drivers/Makefile.in	2007-07-27 13:38:39 +0400

@@ -101,8 +101,9 @@ newhidups: newhidups.o main.o dstate.o .

 		$(NEWHIDUPS_SUBDRIVERS)

 	$(CC) $(CFLAGS) -o $@ $@.o main.o dstate.o \

 		../common/state.o ../common/upsconf.o ../common/parseconf.o \

-		$(LIBOBJ) $(LIBUSB_LIBS) $(LDFLAGS) libhid.o libusb.o hidparser.o \

-		$(NEWHIDUPS_SUBDRIVERS)

+		libhid.o libusb.o hidparser.o \

+		$(NEWHIDUPS_SUBDRIVERS) \

+		$(LIBOBJ) $(LIBUSB_LIBS) $(LDFLAGS)

 # all the stuff that needs to include $(LIBUSB_CFLAGS):

 newhidups.o libhid.o libusb.o $(NEWHIDUPS_SUBDRIVERS) \

@@ -117,7 +118,8 @@ tripplite_usb: tripplite_usb.o main.o ds

 		$(STRLCPY) libhid.o libusb.o hidparser.o

 	$(CC) $(CFLAGS) -o $@ $@.o main.o dstate.o \

 		../common/state.o ../common/upsconf.o ../common/parseconf.o \

-		$(LIBOBJ) $(LIBUSB_LIBS) $(LDFLAGS) -lm libhid.o libusb.o hidparser.o

+		libhid.o libusb.o hidparser.o \

+		$(LIBOBJ) $(LIBUSB_LIBS) $(LDFLAGS) -lm

 # ==========================================================================

 # Special case: bcmxcp_usb.c driver - development version (early beta)

--- nut-2.0.5/man/Makefile.in.alt-makefile	2007-07-27 13:32:02 +0400

+++ nut-2.0.5/man/Makefile.in	2007-07-27 13:37:27 +0400

@@ -31,6 +31,7 @@ DRIVERPAGES = \

 	etapro.8	\

 	everups.8	\

 	fentonups.8 	\

+	gamatronic.8	\

 	genericups.8	\

 	ippon.8		\

 	isbmex.8	\

@@ -45,6 +46,7 @@ DRIVERPAGES = \

 	optiups.8	\

 	powercom.8 	\

 	powerpanel.8	\

+	rhino.8		\

 	megatec.8	\

 	safenet.8	\

 	sms.8		\