X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=3dbc715b3767b4b539ed5a7fbb375e52e4948c81;hb=3bcd7ae2e728772e0ecaa47b083efcb15d9912a8;hp=d9748f504fb9d5a79b63b9bdfbb4aa3fd3d7f75e;hpb=7d71ec6c3f5f3b2cf800147d7a9317214a9c63bd;p=shibboleth%2Fcpp-opensaml.git

diff --git a/Makefile.am b/Makefile.am
index d9748f5..3dbc715 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,41 +6,22 @@ include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-EXTRA_DIST = $(DX_CONFIG) \
-	doc \
-	schemas \
-	cpp-opensaml2.sln \
-	libtool.m4 \
-	doxygen.m4 \
-	acx_pthread.m4 \
-	depcomp \
-	config_win32.h \
-	opensaml.spec.in \
-	opensaml.spec \
-	pkginfo.in \
-	pkginfo \
-	checkinstall
-
-
 dist-hook:
 	rm -rf `find $(distdir)/samltest/data -name .svn`
-	rm -rf `find $(distdir)/schemas -name .svn`
-	rm -rf `find $(distdir)/schemas -name Makefile`
-	rm -rf `find $(distdir)/doc -name .svn`
-	rm -rf `find $(distdir)/doc -name Makefile`
 
 
-SUBDIRS = schemas saml samltest
-
-all-local: opensaml.spec pkginfo
+SUBDIRS = doc schemas saml samltest samlsign
 
 if DX_COND_doc
-all-local: doxygen-doc
+all-local: opensaml.spec pkginfo doxygen-doc
+APIDOCS = doc/api
+else
+all-local: opensaml.spec pkginfo
+endif
 
 install-data-hook:
-	rm -rf $(prefix)/doc/@PACKAGE@/api
-	cp -r doc/api $(prefix)/doc/@PACKAGE@
-endif
+	rm -rf $(DESTDIR)$(prefix)/doc/@PACKAGE@/api
+	cp -r doc/api $(DESTDIR)$(prefix)/doc/@PACKAGE@
 
 opensaml.spec: opensaml.spec.in Makefile
 	rm -f $@.tmp
@@ -54,4 +35,18 @@ pkginfo: pkginfo.in Makefile
 	    -e 's:@-VERSION-@:${VERSION}:'
 	mv $@.tmp $@
 
+EXTRA_DIST = $(DX_CONFIG) \
+	$(APIDOCS) \
+	cpp-opensaml2.sln \
+	libtool.m4 \
+	doxygen.m4 \
+	acx_pthread.m4 \
+	depcomp \
+	config_win32.h \
+	opensaml.spec.in \
+	opensaml.spec \
+	pkginfo.in \
+	pkginfo \
+	checkinstall
+
 DISTCLEANFILES = opensaml.spec pkginfo