X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=Makefile.am;h=2ec3051406c6831c2f6230aa605e45f35f934353;hb=bb8fcc3e0e90c236e914a414b10d80715714188b;hp=f4a98c4be0ada8207850006869f62cce7d6a328c;hpb=59aa21d9cc59e8ed7cc8c4c5758cb392bb0c5b5a;p=m6w6%2Flibmemcached

diff --git a/Makefile.am b/Makefile.am
index f4a98c4b..2ec30514 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,10 @@
-INCLUDES = 
-SUBDIRS = docs libmemcached tests support clients
+ACLOCAL_AMFLAGS = -I m4
+
+SUBDIRS = docs libmemcached libmemcachedutil tests support clients
 EXTRA_dist = README.FIRST
 
+check-local: test-no-outputdiff
+
 test: all
 	@(cd tests; ${MAKE} test)
 
@@ -15,15 +18,19 @@ test-no-outputdiff:
 	@(cd tests; ${MAKE} test-no-outputdiff)
 
 fedora:
+	rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+	rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
 	cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
 	rpmbuild -ba support/libmemcached.spec
-	cp /home/brian/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-	cp /home/brian/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+	cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+	cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
 generic:
+	rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+	rm -f ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm
 	cp libmemcached-$(VERSION).tar.gz /home/brian/rpmbuild/SOURCES/
 	rpmbuild -ba support/libmemcached.spec
-	cp /home/brian/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
-	cp /home/brian/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
+	cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
+	cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
 
 rpm: all dist generic fedora