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

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 24dd994..d90ded4 100644 (file)
--- 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 71ca562..c3c06f6 100644 (file)
--- 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: