[Orxonox-commit 2403] r7118 - code/branches/presentation3/data

adrfried at orxonox.net adrfried at orxonox.net
Fri Jun 4 15:08:03 CEST 2010


Author: adrfried
Date: 2010-06-04 15:08:02 +0200 (Fri, 04 Jun 2010)
New Revision: 7118

Modified:
   code/branches/presentation3/data/DataInstallScript.cmake
Log:
honour DESTDIR environment variable

Modified: code/branches/presentation3/data/DataInstallScript.cmake
===================================================================
--- code/branches/presentation3/data/DataInstallScript.cmake	2010-06-03 15:33:59 UTC (rev 7117)
+++ code/branches/presentation3/data/DataInstallScript.cmake	2010-06-04 13:08:02 UTC (rev 7118)
@@ -28,10 +28,10 @@
  #
 
 # Write some comment
-FILE(APPEND @DATA_INSTALL_DIRECTORY@/DefaultResources.oxr "\n\n\n <!-- ---------------------------------------- -->")
-FILE(APPEND @DATA_INSTALL_DIRECTORY@/DefaultResources.oxr     "\n <!-- Content from the external data directory -->")
-FILE(APPEND @DATA_INSTALL_DIRECTORY@/DefaultResources.oxr     "\n <!-- ---------------------------------------- -->\n\n")
+FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr "\n\n\n <!-- ---------------------------------------- -->")
+FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr     "\n <!-- Content from the external data directory -->")
+FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr     "\n <!-- ---------------------------------------- -->\n\n")
 
 # Append the external file
 FILE(READ   @EXTERNAL_DATA_DIRECTORY@/resources.oxr _external_file)
-FILE(APPEND @DATA_INSTALL_DIRECTORY@/DefaultResources.oxr ${_external_file})
+FILE(APPEND $ENV{DESTDIR}/@DATA_INSTALL_DIRECTORY@/DefaultResources.oxr ${_external_file})




More information about the Orxonox-commit mailing list