*** Makefile.in.orig	Sat Nov 24 09:23:03 2001
--- Makefile.in	Sun Dec  2 11:47:56 2001
***************
*** 219,249 ****
  	@echo "Installing apcaccess binary..."
  	$(INSTALL_PROGRAM) $(srcdir)/apcaccess $(sbindir)/apcaccess
  	@echo "Installing apccontrol script..."
! 	$(INSTALL_PROGRAM) -m 744 $(srcdir)/distributions/$(DISTNAME)/apccontrol.sh $(sysconfdir)/apccontrol
  	@echo "Installing manual pages..."
  	$(INSTALL_DATA) $(srcdir)/doc/apcupsd.man $(mandir)/apcupsd.$(manext)
  	@echo "Installing language catalogs..."
  	@POMAKE@ install
  # don't overwrite any existing config file
! 	echo "Installing apcupsd.conf..."; \
  	if [ -f $(srcdir)/distributions/$(DISTNAME)/apcupsd.conf ]; then \
  		srcconf=$(srcdir)/distributions/$(DISTNAME)/apcupsd.conf; \
  	else \
  		srcconf=etc/apcupsd.conf; \
  	fi; \
! 	if test -f $(sysconfdir)/apcupsd.conf; then \
! 		dstconf=apcupsd.conf.new; \
! 		echo "	found old apcupsd.conf, installing new conf file as $$dstconf"; \
! 	else \
! 		dstconf=apcupsd.conf; \
! 	fi; \
  	echo "$(INSTALL_DATA) $$srcconf $(sysconfdir)/$$dstconf"; \
! 	$(INSTALL_PROGRAM) -m 644 $$srcconf $(sysconfdir)/$$dstconf
! 	$(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/changeme $(sysconfdir)
! 	$(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/commfailure $(sysconfdir)
! 	$(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/commok $(sysconfdir)
! 	$(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/onbattery $(sysconfdir)
! 	$(INSTALL_PROGRAM) -m 744 $(srcdir)/etc/mainsback $(sysconfdir)
  
  
  install-apcupsdwin32: apcupsd
--- 219,244 ----
  	@echo "Installing apcaccess binary..."
  	$(INSTALL_PROGRAM) $(srcdir)/apcaccess $(sbindir)/apcaccess
  	@echo "Installing apccontrol script..."
! 	$(INSTALL_DATA) -m 744 $(srcdir)/distributions/$(DISTNAME)/apccontrol.sh $(sysconfdir)/apccontrol
  	@echo "Installing manual pages..."
  	$(INSTALL_DATA) $(srcdir)/doc/apcupsd.man $(mandir)/apcupsd.$(manext)
  	@echo "Installing language catalogs..."
  	@POMAKE@ install
  # don't overwrite any existing config file
! 	echo "Installing sample apcupsd.conf..."; \
  	if [ -f $(srcdir)/distributions/$(DISTNAME)/apcupsd.conf ]; then \
  		srcconf=$(srcdir)/distributions/$(DISTNAME)/apcupsd.conf; \
  	else \
  		srcconf=etc/apcupsd.conf; \
  	fi; \
! 	dstconf=apcupsd.conf.sample; \
  	echo "$(INSTALL_DATA) $$srcconf $(sysconfdir)/$$dstconf"; \
! 	$(INSTALL_DATA) -m 644 $$srcconf $(sysconfdir)/$$dstconf
! 	$(INSTALL_DATA) -m 744 $(srcdir)/etc/changeme $(sysconfdir)
! 	$(INSTALL_DATA) -m 744 $(srcdir)/etc/commfailure $(sysconfdir)
! 	$(INSTALL_DATA) -m 744 $(srcdir)/etc/commok $(sysconfdir)
! 	$(INSTALL_DATA) -m 744 $(srcdir)/etc/onbattery $(sysconfdir)
! 	$(INSTALL_DATA) -m 744 $(srcdir)/etc/mainsback $(sysconfdir)
  
  
  install-apcupsdwin32: apcupsd