Bit of cleanup, and add changelog.

[shibboleth/cpp-sp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 790cb3f..e2a1f65 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,11 +10,10 @@ WANT_SUBDIRS = @WANT_SUBDIRS@
 
 SUBDIRS = $(WANT_SUBDIRS)
 
-DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib fastcgi odbc-store selinux
+DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib fastcgi odbc-store memcache-store selinux
 
 if DX_COND_doc
 all-local: shibboleth.spec pkginfo doxygen-doc
-APIDOCS = doc/api
 else
 all-local: shibboleth.spec pkginfo
 endif
@@ -24,23 +23,22 @@ install-data-hook:
        cp -r doc/api $(DESTDIR)$(datadir)/doc/@PACKAGE@
 
 dist-hook:
-       rm -rf `find $(distdir)/isapi -name .svn`
+       rm -rf `find $(distdir)/isapi_shib -name .svn`
        rm -rf `find $(distdir)/doc/api -name .svn`
 
 shibboleth.spec: shibboleth.spec.in Makefile
        rm -f $@.tmp
-       sed < $< > $@.tmp \
+       sed < $@.in > $@.tmp \
            -e 's:@-VERSION-@:${VERSION}:'
        mv $@.tmp $@
 
 pkginfo: pkginfo.in Makefile
        rm -f $@.tmp
-       sed < $< > $@.tmp \
+       sed < $@.in > $@.tmp \
            -e 's:@-VERSION-@:${VERSION}:'
        mv $@.tmp $@
 
 EXTRA_DIST = $(DX_CONFIG) \
-    $(APIDOCS) \
     isapi_shib \
     Shibboleth.sln \
     libtool.m4 \