Fix version numbers.

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

diff --git a/Makefile.am b/Makefile.am
index 34f91c2..e2a1f65 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,33 +10,35 @@ WANT_SUBDIRS = @WANT_SUBDIRS@
 
 SUBDIRS = $(WANT_SUBDIRS)
 
-DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib 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
 
 install-data-hook:
-    rm -rf $(DESTDIR)$(datadir)/doc/@PACKAGE@/api
-    cp -r doc/api $(DESTDIR)$(datadir)/doc/@PACKAGE@
+       rm -rf $(DESTDIR)$(datadir)/doc/@PACKAGE@/api
+       cp -r doc/api $(DESTDIR)$(datadir)/doc/@PACKAGE@
+
+dist-hook:
+       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 \
@@ -48,6 +50,7 @@ EXTRA_DIST = $(DX_CONFIG) \
     shibboleth.spec \
     pkginfo.in \
     pkginfo \
-    checkinstall
+    depend \
+    postinstall
 
 DISTCLEANFILES = shibboleth.spec pkginfo