Fix documentation directory and eliminate special handling in spec file.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/trunk@388 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/Makefile.am b/Makefile.am
index 7f4b693..25be000 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,8 @@ all-local: xmltooling.spec pkginfo
 endif
 
 install-data-hook:
-       rm -rf $(DESTDIR)/$(prefix)/doc/@PACKAGE@/api
-       cp -r doc/api $(DESTDIR)/$(prefix)/doc/@PACKAGE@
+       rm -rf $(DESTDIR)/$(datadir)/doc/@PACKAGE@/api
+       cp -r doc/api $(DESTDIR)/$(datadir)/doc/@PACKAGE@
 
 xmltooling.spec: xmltooling.spec.in Makefile
        rm -f $@.tmp

diff --git a/bootstrap b/bootstrap
index 3f9499f..7e97243 100644 (file)
--- a/bootstrap
+++ b/bootstrap
@@ -13,11 +13,11 @@ find_program()
 }
 
 # Find appropriate versions of the auto tools
-find_program aclocal 1.7
+find_program aclocal 1.9
 aclocal="$program"
 find_program autoheader 2.53
 autoheader="$program"
-find_program automake 1.7
+find_program automake 1.9
 automake="$program"
 find_program autoconf 2.53
 autoconf="$program"

diff --git a/doc/Makefile.am b/doc/Makefile.am
index bafa6e2..893ebd9 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-pkgdocdir = $(prefix)/doc/@PACKAGE@
+pkgdocdir = $(datadir)/doc/@PACKAGE@
 
 docfiles = \
        LICENSE.txt \
@@ -12,4 +12,3 @@ docfiles = \
 pkgdoc_DATA = $(docfiles)
 
 EXTRA_DIST = $(docfiles)
-

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index f9384e3..481b7e2 100644 (file)
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -55,9 +55,7 @@ XMLTooling Library API documentation generated by doxygen.
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
-%{__rm} -rf _docs
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
-%{__mv} $RPM_BUILD_ROOT/usr/doc/xmltooling _docs
 
 %check || :
 %{__make} check
@@ -75,12 +73,17 @@ XMLTooling Library API documentation generated by doxygen.
 
 %files
 %defattr(-,root,root,-)
-%doc _docs/LICENSE.txt _docs/NOTICE.txt
 %{_libdir}/libxmltooling.so.*
 %{_libdir}/libxmltooling-lite.so.*
 %dir %{_datadir}/xml/xmltooling
 %{_datadir}/xml/xmltooling
 %exclude %{_bindir}/xmltoolingtest
+%docdir %{_datadir}/doc/xmltooling
+%{_datadir}/doc/xmltooling/LICENSE.txt
+%{_datadir}/doc/xmltooling/NOTICE.txt
+%{_datadir}/doc/xmltooling/CURL.LICENSE
+%{_datadir}/doc/xmltooling/LOG4CPP.LICENSE
+%{_datadir}/doc/xmltooling/OPENSSL.LICENSE
 
 %files devel
 %defattr(-,root,root,-)
@@ -90,7 +93,7 @@ XMLTooling Library API documentation generated by doxygen.
 
 %files docs
 %defattr(644,root,root,755)
-%doc _docs/api
+%doc %{_datadir}/doc/xmltooling/api
 
 %changelog
 * Thu Aug 16 2007  Scott Cantor  <cantor.2@osu.edu>  - 1.0-3