[Oscar-checkins] svn:oscar r8772 - trunk

[<val...@or...>]

Author: valleegr
Date: 2009-09-26 01:40:30 EDT (Sat, 26 Sep 2009)
New Revision: 8772
URL: https://svn.oscar.openclustergroup.org/trac/oscar/changeset/8772

Log:
This check-in fixes #542 - Include the documentation into the OSCAR binary 
packages.

Text files modified: 
   trunk/ChangeLog |     1 +                                       
   trunk/Makefile  |     9 ++++++++-                               
   2 files changed, 9 insertions(+), 1 deletions(-)

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	2009-09-26 01:40:30 EDT (Sat, 26 Sep 2009)
@@ -2,6 +2,7 @@
 - [Ticket #405] When post image creation scripts fail, the image is deleted.
 - [Ticket #520] Ganglia configuration scripts do not generate any error
 anymore.
+- [Ticket #542] Include the documentation into the OSCAR binary packages.
 
 6.0.4:
 - Update Configurator to 1.0.3.

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	2009-09-26 01:40:30 EDT (Sat, 26 Sep 2009)
@@ -92,9 +92,16 @@
 	@echo "== Installed OSCAR into $(DESTDIR)/opt/oscar-$(OSCAR_VERSION) =="
 
 #
+# Install the documentation
+#
+doc-install:
+	install -d -m 0755 $(DESTDIR)/usr/share/doc/oscar
+	install    -m 0755 doc/*.pdf $(DESTDIR)/usr/share/doc/oscar
+
+#
 # Install OSCAR (scripts, libs and so on) directly in the system.
 #
-install:
+install: doc-install
 	# Install the logo at destination (no Makefile to do so).
 	install -d -m 0755 $(DESTDIR)/usr/share/oscar/images
 	install    -m 0755 images/oscar.gif $(DESTDIR)/usr/share/oscar/images