X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=25be0004b3b4af9efcb248b7baf183c0b7372bc5;hb=165c51f18bf4973fc95116ad5fa3df32a19e5c44;hp=ca5e29a0b14103393f66e5fc60fbfe1a1b21373d;hpb=a267098633bed27761349fad63d1dcce5b82a5d1;p=shibboleth%2Fxmltooling.git

diff --git a/Makefile.am b/Makefile.am
index ca5e29a..25be000 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,41 +6,22 @@ include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-EXTRA_DIST = $(DX_CONFIG) \
-	doc \
-	schemas \
-	cpp-xmltooling.sln \
-	acx_pthread.m4 \
-	acinclude.m4 \
-	libtool.m4 \
-	doxygen.m4 \
-	depcomp \
-	config_win32.h \
-	xmltooling.spec.in \
-	xmltooling.spec \
-	pkginfo.in \
-	pkginfo \
-	checkinstall
-
 dist-hook:
 	rm -rf `find $(distdir)/xmltoolingtest/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 xmltooling xmltoolingtest
-
-all-local: xmltooling.spec pkginfo
+SUBDIRS = doc schemas xmltooling xmltoolingtest
 
 if DX_COND_doc
-all-local: doxygen-doc
+all-local: doxygen-doc xmltooling.spec pkginfo
+APIDOCS = doc/api
+else
+all-local: xmltooling.spec pkginfo
+endif
 
 install-data-hook:
-	rm -rf $(prefix)/doc/@PACKAGE@/api
-	cp -r doc/api $(prefix)/doc/@PACKAGE@
-endif
+	rm -rf $(DESTDIR)/$(datadir)/doc/@PACKAGE@/api
+	cp -r doc/api $(DESTDIR)/$(datadir)/doc/@PACKAGE@
 
 xmltooling.spec: xmltooling.spec.in Makefile
 	rm -f $@.tmp
@@ -54,4 +35,19 @@ pkginfo: pkginfo.in Makefile
 	    -e 's:@-VERSION-@:${VERSION}:'
 	mv $@.tmp $@
 
+EXTRA_DIST = $(DX_CONFIG) \
+        $(APIDOCS) \
+        cpp-xmltooling.sln \
+        acx_pthread.m4 \
+        acinclude.m4 \
+        libtool.m4 \
+        doxygen.m4 \
+        depcomp \
+        config_win32.h \
+        xmltooling.spec.in \
+        xmltooling.spec \
+        pkginfo.in \
+        pkginfo \
+        checkinstall
+
 DISTCLEANFILES = xmltooling.spec pkginfo