X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=3d9bdc8d093615dd11c371eb34e0e891b2a3f5c9;hb=454a08736ca5f6bdbdf78faf47b2050fb2b47a26;hp=3ce1ce14ea1b9c00c485d59d61ec529d5a62ae8c;hpb=008c2d22e1e313ce022e59cec0914dd82a950326;p=shibboleth%2Fsp.git

diff --git a/Makefile.am b/Makefile.am
index 3ce1ce1..3d9bdc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,37 +10,21 @@ 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
+all-local: doxygen-doc
 else
-all-local: shibboleth.spec pkginfo
+all-local:
 endif
 
-install-data-hook:
-	rm -rf $(DESTDIR)$(datadir)/doc/@PACKAGE@/api
-	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 \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
-
-pkginfo: pkginfo.in Makefile
-	rm -f $@.tmp
-	sed < $< > $@.tmp \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
+GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile
 
 EXTRA_DIST = $(DX_CONFIG) \
-    $(APIDOCS) \
     isapi_shib \
     Shibboleth.sln \
     libtool.m4 \
@@ -48,10 +32,7 @@ EXTRA_DIST = $(DX_CONFIG) \
     acx_pthread.m4 \
     depcomp \
     config_win32.h \
-    shibboleth.spec.in \
-    shibboleth.spec \
-    pkginfo.in \
-    pkginfo \
-    checkinstall
-
-DISTCLEANFILES = shibboleth.spec pkginfo
+    $(GENFILES) \
+    $(GENFILES:%=%.in) \
+    depend \
+    postinstall