--- nut-2.0.0/conf/Makefile.in.orig	2002-09-03 11:23:02 +0400
+++ nut-2.0.0/conf/Makefile.in	2004-04-05 00:01:03 +0400
@@ -17,14 +17,14 @@
 
 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.orig	2007-01-03 14:36:48 +0300
+++ nut-2.0.5/drivers/Makefile.in	2007-03-25 07:18:57 +0400
@@ -101,7 +101,8 @@
 		$(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 \
+		libhid.o libusb.o hidparser.o \
+		$(LIBOBJ) $(LIBUSB_LIBS) $(LDFLAGS) \
 		$(NEWHIDUPS_SUBDRIVERS)
 
 # all the stuff that needs to include $(LIBUSB_CFLAGS):
@@ -117,7 +118,8 @@
 		$(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)