Updates, rpm now tests the install locations.

[awesomized/libmemcached] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0bfe7ccd453ebf58d314185d90daa70a7d2ce3e9..d163202714941cb07d46fe389fe06246813091d4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,22 +4,25 @@ ACLOCAL_AMFLAGS = -I m4
 SUFFIXES =
 PHONY =
 TESTS =
-CLEANFILES = 
+CLEANFILES =
 bin_PROGRAMS =
 noinst_HEADERS =
 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
-pkginclude_HEADERS =
-nobase_pkginclude_HEADERS =
+include_HEADERS =
+nobase_include_HEADERS =
 EXTRA_HEADERS =
 BUILT_SOURCES=
 EXTRA_DIST = README.FIRST
 
 SUBDIRS = docs
 
+test-docs:
+       (cd docs && $(MAKE) test-docs)
 include libmemcached/include.am
 include clients/include.am
+include libhashkit/include.am
 include tests/include.am
 include example/include.am
 include support/include.am
@@ -30,7 +33,7 @@ check-local: 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/
+       cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
        rpmbuild -ba support/libmemcached.spec
        cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
        cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .
@@ -38,7 +41,7 @@ fedora:
 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/
+       cp libmemcached-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
        rpmbuild -ba support/libmemcached.spec
        cp ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm .
        cp ~/rpmbuild/SRPMS/libmemcached-$(VERSION)*.rpm .