Index: BPView-bpview-0.12.1/bin/Makefile.am
===================================================================
--- BPView-bpview-0.12.1.orig/bin/Makefile.am
+++ BPView-bpview-0.12.1/bin/Makefile.am
@@ -34,7 +34,7 @@ SCRIPT2=bpview_reload
 
 # compile
 all:
-	cp $(SCRIPT1).pl.in $(SCRIPT1).tmp
+	cp $(SCRIPT1).pl $(SCRIPT1).tmp
 	sed -i -e 's!lib_path = .*!lib_path = "$(LIBDIR)";!' $(SCRIPT1).tmp
 	sed -i -e 's!cfg_path = .*!cfg_path = "$(SYSCONFDIR)";!' $(SCRIPT1).tmp
 	sed -i -e 's!log_path = .*!log_path = "$(LOCALSTATEDIR)/log/bpview/";!' $(SCRIPT1).tmp
@@ -42,7 +42,7 @@ all:
 	cp $(SCRIPT1).tmp $(SCRIPT1)
 	rm -f $(SCRIPT1).tmp
 	
-	cp $(SCRIPT2).pl.in $(SCRIPT2).tmp
+	cp $(SCRIPT2).pl $(SCRIPT2).tmp
 	sed -i -e 's!lib_path = .*!lib_path = "$(LIBDIR)";!' $(SCRIPT2).tmp
 	sed -i -e 's!cfg_path = .*!cfg_path = "$(SYSCONFDIR)";!' $(SCRIPT2).tmp
 	cp $(SCRIPT2).tmp $(SCRIPT2)
Index: BPView-bpview-0.12.1/cgi/Makefile.am
===================================================================
--- BPView-bpview-0.12.1.orig/cgi/Makefile.am
+++ BPView-bpview-0.12.1/cgi/Makefile.am
@@ -22,7 +22,7 @@ SCRIPT=bpview
 
 # compile
 all:
-	cp $(SCRIPT).pl.in $(SCRIPT).tmp
+	cp $(SCRIPT).pl $(SCRIPT).tmp
 	sed -i -e 's!lib_path = .*!lib_path = "$(LIBDIR)";!' $(SCRIPT).tmp
 	sed -i -e 's!cfg_path = .*!cfg_path = "$(SYSCONFDIR)";!' $(SCRIPT).tmp
 	sed -i -e 's!$reload_log = .*!$reload_log = "$(LOCALSTATEDIR)/log/bpview/reload.log";!' $(SCRIPT).tmp
Index: BPView-bpview-0.12.1/etc/Makefile.am
===================================================================
--- BPView-bpview-0.12.1.orig/etc/Makefile.am
+++ BPView-bpview-0.12.1/etc/Makefile.am
@@ -23,14 +23,11 @@ CONTACTGROUP=admins
 
 # compile
 all:
-	cp $(CONF).yml.in $(CONF).tmp
+	cp $(CONF).yml $(CONF).tmp
 	sed -i -e 's!^  data_dir:.*!  data_dir: $(DATAROOTDIR)!' $(CONF).tmp
 	sed -i -e 's!^  src_dir:.*!  src_dir: $(DATAROOTDIR)/src!' $(CONF).tmp
 	sed -i -e 's!^  logfile:.*!  logfile: $(LOCALSTATEDIR)/log/bpview/bpview.log!' $(CONF).tmp
 	cp $(CONF).tmp $(CONF).yml
-	cp datasource.yml.in datasource.yml
-	cp bpviewd.yml.in bpviewd.yml
-	cp mappings.yml.in mappings.yml
 	rm -f $(CONF).tmp
 	
 # install
Index: BPView-bpview-0.12.1/Makefile.am
===================================================================
--- BPView-bpview-0.12.1.orig/Makefile.am
+++ BPView-bpview-0.12.1/Makefile.am
@@ -61,13 +61,13 @@ all:
 	cd $(LOG_DIR) && $(MAKE) $@
 	cd $(SHARE_DIR) && $(MAKE) $@
 	
-	cp sample-config/$(HTTPCONF).conf.in sample-config/$(HTTPCONF).tmp
+	cp sample-config/$(HTTPCONF).conf sample-config/$(HTTPCONF).tmp
 	sed -i 's!/data/www/BPView/cgi!$(CGIDIR)!' sample-config/$(HTTPCONF).tmp
 	sed -i 's!/data/www/BPView/share!$(DATAROOTDIR)!' sample-config/$(HTTPCONF).tmp
 	cp sample-config/$(HTTPCONF).tmp sample-config/$(HTTPCONF).conf
 	rm -f sample-config/$(HTTPCONF).tmp
 	
-	cp $(INITRH6).in $(INITRH6).tmp
+	cp $(INITRH6) $(INITRH6).tmp
 	sed -i -e 's!PROG_BIN=.*!PROG_BIN="$(BINDIR)/bpviewd"!' $(INITRH6).tmp
 	sed -i -e 's!PID_FILE=.*!PID_FILE="$(LOCALSTATEDIR)/run/bpviewd.pid"!' $(INITRH6).tmp
 	cp $(INITRH6).tmp $(INITRH6)
@@ -83,7 +83,7 @@ install:
 	cd $(LOG_DIR) && $(MAKE) $@
 	cd $(SHARE_DIR) && $(MAKE) $@
 	
-	for file in AUTHORS ChangeLog COPYING NEWS README.md sample-config/*; do \
+	for file in AUTHORS ChangeLog NEWS README.md sample-config/*; do \
 	  $(INSTALL) -D -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(DOCDIR)/$$file; \
 	done