From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 16 Oct 2009 07:54:18 +0000 (+0000)
Subject: Integrate patch #8636: Obey DESTDIR when installing documentation (thanks to Robson... 
X-Git-Tag: SVN~916
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c19ddaff7936b6e982ac24b571007399a32a0d90

Integrate patch #8636: Obey DESTDIR when installing documentation (thanks to Robson Peixoto)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6798 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/ChangeLog b/ChangeLog
index 24dd994e69..d90ded4ba1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,6 +109,8 @@ SimGrid (3.3.4) unstable; urgency=low
  * Fix #8569: XBT/synchro.h has redundant declarations
  * Fix #8563: MSG return values and exceptions
    Introduce a MSG_TIMEOUT_FAILURE return code and use it consistently.
+ * Integrate patch #8636: Obey DESTDIR when installing documentation.
+   Thanks to Robson Peixoto.
 
  -- Da SimGrid team <simgrid-devel@lists.gforge.inria.fr> 
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 71ca56294f..c3c06f6d91 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -81,11 +81,11 @@ endif
 install-data-local: 
 	@for file in `find html/ -type d` ; do \
 	   echo "test -z \"$(prefix)/doc/simgrid/$$file\" || $(mkdir_p) \"$(prefix)/doc/simgrid/$$file\"";\
-	   test -z "$(prefix)/doc/simgrid/$$file" || $(mkdir_p) "$(prefix)/doc/simgrid/$$file";\
+	   test -z "$(DESTDIR)/$(prefix)/doc/simgrid/$$file" || $(mkdir_p) "$(DESTDIR)/$(prefix)/doc/simgrid/$$file";\
 	done
 	@for file in `find html/ -type f` ; do \
-	   echo " $(INSTALL_DATA) '$$file' '$(prefix)/doc/simgrid/$$file'";\
-	   $(INSTALL_DATA) $$file $(prefix)/doc/simgrid/$$file ;\
+	   echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)/$(prefix)/doc/simgrid/$$file'";\
+	   $(INSTALL_DATA) $$file $(DESTDIR)/$(prefix)/doc/simgrid/$$file ;\
 	done
 
 uninstall-local: