Package fixes.

[shibboleth/xmltooling.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ca5e29a..05bea16 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,41 +6,23 @@ 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`
+       rm -rf `find $(distdir)/doc/api -name .svn`
 
 
-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 +36,20 @@ 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 \
+        depend \
+        postinstall
+
 DISTCLEANFILES = xmltooling.spec pkginfo