[sword-svn] r3301 - in branches/sword-1-7-x: . bindings/swig/python

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2014-12-10 22:21:46 -0700 (Wed, 10 Dec 2014)
New Revision: 3301

Modified:
   branches/sword-1-7-x/
   branches/sword-1-7-x/bindings/swig/python/CMakeLists.txt
Log:
Merging r3299



Property changes on: branches/sword-1-7-x
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202-3203,3225,3230,3232-3234,3236,3238-3239,3242,3244,3256-3257,3272-3274,3289
   + /trunk:2989-2991,2997,3001-3004,3006,3010-3020,3026-3039,3045-3046,3048,3056,3058-3062,3067,3073,3077-3081,3085-3086,3091,3094,3097-3099,3102,3104,3106-3108,3110,3115,3118-3121,3126-3127,3131-3135,3140,3144,3151,3153-3155,3190-3192,3198-3199,3202-3203,3225,3230,3232-3234,3236,3238-3239,3242,3244,3256-3257,3272-3274,3289,3299

Modified: branches/sword-1-7-x/bindings/swig/python/CMakeLists.txt
===================================================================
--- branches/sword-1-7-x/bindings/swig/python/CMakeLists.txt	2014-12-10 05:52:08 UTC (rev 3300)
+++ branches/sword-1-7-x/bindings/swig/python/CMakeLists.txt	2014-12-11 05:21:46 UTC (rev 3301)
@@ -45,9 +45,9 @@
 
 # Allow user installation to custom directory
 IF(SWORD_PYTHON_INSTALL_DIR)
-	SET(SETUP_ARGS "--home=${SWORD_PYTHON_INSTALL_DIR}")
+    SET(SETUP_ARGS "--home=${SWORD_PYTHON_INSTALL_DIR} --root \$ENV{DESTDIR}")
 ELSE(SWORD_PYTHON_INSTALL_DIR)
-	SET(SETUP_ARGS "--home=${CMAKE_INSTALL_PREFIX}")
+    SET(SETUP_ARGS "--root \$ENV{DESTDIR}")
 ENDIF(SWORD_PYTHON_INSTALL_DIR)
 CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/install.cmake.in"
 	       "${CMAKE_CURRENT_BINARY_DIR}/install.cmake")