Fix up doc handling in spec file

diff --git a/Makefile.am b/Makefile.am
index 181d777..7f4b693 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,16 +12,16 @@ dist-hook:
 
 SUBDIRS = doc schemas xmltooling xmltoolingtest
 
-all-local: xmltooling.spec pkginfo
-
 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@
+       rm -rf $(DESTDIR)/$(prefix)/doc/@PACKAGE@/api
+       cp -r doc/api $(DESTDIR)/$(prefix)/doc/@PACKAGE@
 
 xmltooling.spec: xmltooling.spec.in Makefile
        rm -f $@.tmp

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index af1aca2..8160f71 100644 (file)
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -11,7 +11,7 @@ BuildRoot:    %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: xerces%{?xercesver}-c-devel >= 2.6.1
 BuildRequires: xml-security-c-devel >= 1.3.1
-BuildRequires: log4cpp-devel >= 0.3.5, cxxtest, doxygen
+BuildRequires: log4cpp-devel >= 0.3.5, cxxtest
 
 %description
 The XMLTooling library contains generic XML parsing and processing
@@ -87,7 +87,7 @@ make check
 
 %files docs
 %defattr(644,root,root,755)
-%doc _docs/api/*
+%doc _docs/api
 
 %changelog
 * Wed Apr 12 2006  Scott Cantor  <cantor.2@osu.edu>  - 1.0-1

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 25858c4..e7c1ee0 100644 (file)
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -178,7 +178,7 @@ common_sources = \
        util/URLEncoder.cpp \
        util/XMLConstants.cpp \
        util/XMLHelper.cpp \
-       validation/ValidatorSuite.cpp \ 
+       validation/ValidatorSuite.cpp \
        $(thread_sources)
 
 libxmltooling_lite_la_SOURCES = \