Mark executable.

diff --git a/Makefile.am b/Makefile.am
index 3dbc715..dbdc10c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,8 @@ all-local: opensaml.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@
 
 opensaml.spec: opensaml.spec.in Makefile
        rm -f $@.tmp

diff --git a/bootstrap b/bootstrap
old mode 100644 (file)
new mode 100755 (executable)
index 3f9499f..7e97243
--- 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 1baaa89..ae479f6 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 \

diff --git a/opensaml.spec.in b/opensaml.spec.in
index 8474894..508b4af 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -51,9 +51,7 @@ OpenSAML 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/%{name} _docs
 
 %check || :
 %{__make} check
@@ -77,6 +75,10 @@ OpenSAML Library API documentation generated by doxygen.
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}
 %exclude %{_bindir}/samltest
+%docdir %{_datadir}/doc/%{name}
+%{_datadir}/doc/%{name}/LICENSE.txt
+%{_datadir}/doc/%{name}/NOTICE.txt
+%{_datadir}/doc/%{name}/LOG4CPP.LICENSE
 
 %files devel
 %defattr(-,root,root,-)
@@ -85,7 +87,7 @@ OpenSAML Library API documentation generated by doxygen.
 
 %files docs
 %defattr(644,root,root,755)
-%doc _docs/api
+%doc %{_datadir}/doc/%{name}/api
 
 %changelog
 * Thu Aug 16 2007 Scott Cantor  <cantor.2@osu.edu>  - 2.0-3