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

diff --git a/Makefile.am b/Makefile.am
index f4a98c4b..95382924 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
+ACLOCAL_AMFLAGS = -I config
 INCLUDES = 
-SUBDIRS = docs libmemcached tests support clients
+SUBDIRS = docs libmemcached libmemcachedutil tests support clients
 EXTRA_dist = README.FIRST
 
 test: all
@@ -15,15 +16,19 @@ test-no-outputdiff:
 	@(cd tests; ${MAKE} test-no-outputdiff)
 
 fedora:
+	rm ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+	rm ~/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 ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
+	rm ~/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