From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 28 Apr 2011 10:42:05 +0000 (+0200)
Subject: Fix 'make dist' due to RPM files being moved
X-Git-Tag: v1.5.7~13^2~22^2^2
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=3f877459a5e916db9d22d81fdfc81693ae0afc9f;p=pazpar2-moved-to-github.git

Fix 'make dist' due to RPM files being moved
---

diff --git a/Makefile.am b/Makefile.am
index a485e2b..85fbc8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,8 @@ dist-hook:
 	for d in etc etc/settings etc/services www/test1 www/jsdemo www/iphone; do \
 		mkdir -p $(distdir)/$$d; cp -r $$d/* $(distdir)/$$d; \
 	done; rm -f $(distdir)/etc/pazpar2.cfg; exit 0
+	mkdir $(distdir)/rpm
+	-cp $(srcdir)/rpm/* $(distdir)/rpm
 
 .PHONY:debian
 debian:
diff --git a/src/Makefile.am b/src/Makefile.am
index c956188..bc9be7b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,8 +3,6 @@
 sbin_PROGRAMS = pazpar2
 noinst_PROGRAMS = pazpar2_play
 
-EXTRA_DIST = pazpar2.rpm.init pazpar2.rpm.logrotate
-
 check_PROGRAMS = \
       test_sel_thread \
       test_normalize