Subject: [Fenics-ufc] Minor fixes in build system

From: Johannes Ring <[email-masked]>
Date: Mon, 20 Jun 2011 14:04:01 +0200

Hi,

The attched patch fixes some minor issues in the build system. Please apply.

Johannes
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [email-masked]
# target_branch: bzr+ssh://bazaar.launchpad.net/~ufc-core/ufc/main/
# testament_sha1: 65abae9e28c043fcf14fde4776767a578b8d4bc2
# timestamp: 2011-06-20 13:58:49 +0200
# base_revision_id: [email-masked]
# 
# Begin patch
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-06-12 21:14:34 +0000
+++ CMakeLists.txt	2011-06-20 11:58:11 +0000
@@ -59,8 +59,14 @@
     )
 
   # Set Python installation path
-  set(UFC_INSTALL_PYTHON_MODULE_DIR ${PYTHON_INSTALL_PATH})
-  set(UFC_INSTALL_PYTHON_EXT_DIR ${PYTHON_INSTALL_PATH})
+  if (NOT DEFINED UFC_INSTALL_PYTHON_MODULE_DIR)
+    set(UFC_INSTALL_PYTHON_MODULE_DIR ${PYTHON_INSTALL_PATH}
+      CACHE PATH "Python module installation directory.")
+  endif()
+  if (NOT DEFINED UFC_INSTALL_PYTHON_EXT_DIR)
+    set(UFC_INSTALL_PYTHON_EXT_DIR ${PYTHON_INSTALL_PATH}
+      CACHE PATH "Python extension module installation directory.")
+  endif()
 endif (PYTHONINTERP_FOUND)
 
 #------------------------------------------------------------------------------
@@ -150,7 +156,7 @@
 
 configure_file(${UFC_CMAKE_DIR}/ufc-config.cmake.in ufc-config.cmake @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ufc-config.cmake
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/${UFC_CMAKE_CONFIG_DIR}
+  DESTINATION ${UFC_CMAKE_CONFIG_DIR}
   COMPONENT Development
   )
 
@@ -159,7 +165,7 @@
 
 configure_file(${UFC_CMAKE_DIR}/ufc-1.pc.in ufc-1.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ufc-1.pc
-  DESTINATION ${CMAKE_INSTALL_PREFIX}/${UFC_PKGCONFIG_DIR}
+  DESTINATION ${UFC_PKGCONFIG_DIR}
   COMPONENT Development
   )

# Begin bundle

---

From: Anders Logg <[email-masked]>
Date: Mon, 20 Jun 2011 14:39:12 +0200

Just go ahead and push.

--
Anders

> IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWWF9+koAAaHfgFAQVGf/93//
> 3mC//9/6UAQ6e101thwRrs3BKJNCZU/JgJT9NU9J+o2igemp+qeUep6n6p6n6o8oeoNNBkkn6o9P
> RGqep+oj0gNAABkAaAAAElNJmlT0xDKYnooG0TRkAyBkADJgOMmTTTCZGQMCMTRgjCDRpgAEEkhE
> xpMBTyjKemUBoaZNDRoZBpjRNqIhZj3EK/1mwL8JDkhlqY0RlcIpvPuVU1TjvZQTCNRtNhgQZuNS
> gq9MQ6teWhZnGSzsHX6B3HH4lJ3k3XaXPzj4sA4zp4OnN06fpj5nVxjingp5H49NdlFdT+wvRxrR
> gYMRiYbj2FY7VdZ6CY4hGLnmVV4t/YmMHx/aRYs9LKTpICkNTFaQQbfa0gI4nJb6nKxQTmHvmhu8
> OaoJmTpBRnmJ65BFXecPFoFMIvTCtJJZiS0q0FPSKLS/BODp0qC5AkgmJw2UzyihkFE63oxsxBPE
> 4wmeEXBcP2tlO6EgOl7x4xk1rZUmVJcQLuJxQ8Lhgcs43G0+QRLyukVtExwFD6jcKqi16P5cVGo8
> DXVMKpQ19iwtKiRWW7oNUwsVpzWvGZZK5oY4ZgY0NV5PQK4V+eNsKC0YpircqyqyImJClCLLtVjX
> oPEYVBaAYmSLcNUXLTeR7WwK3fwNfuODxXdbSE4sGuA7KE4SKA7wp7jLTivMxww2fPH1htS+p2co
> u4OcpsZMc/3PyeOFjuvrFmJAgLadJGk6OkJTu2lHgLMOOWTabxkMBYMMUCcRFmvxpHCzironGLSk
> GOocJwt8cQLxX3kuBOj/DGT2nC+EHmYWJMv6K03CYcMUbim2LM7IoMRXOsZm0FYQBTMMUG3eW5Q+
> 3NpvRBgcD8Cbufw3l5zi3R7A1nAwmSdXdE4HGJDIlKYR1D0rkrTxTB44KVHt3iNcxwMCEsMXeOez
> LlZh3y2ZKEg+dFrKDuieSt9Gcmo7VmgmfOwkJCDklv1tTtcYj1smLJKSNKS1dcVfZqVkskgS1ajT
> XzupVs1mjK8q/thIaCeM1oqQ1N7a49ea3OPEIZEia6WqSUQ2ECk8ZzzMPY85UPlNQcGPaakWBarr
> SIQAeUstJWhxLrFhvFvb1Js2BpDIB5WkQvDP+LoLo4L5ZydmCJwhNzajsp65obBchyDVV6Cg1Bmy
> DQEQi4NqQy2sQREfRBVWBwCfYWnhXko+QqWnRNicyaRrTSJEkg8KiGth5GQD1JD5EpXJkMyZSbIB
> DgUjENWB/e5N+yA3wiIROgMIYgKza4ibSlgREx5lLOKVNT3E9OhXJRD0XkkPjkKa6LBXxu9SnMUF
> IMGr7DhG2Qr7ki/OEa0+XdyTdNuBFWNf8JECcWcSAxROYzuONTW4Uj1QETSMOUjlPrV6tln0pDho
> b3NT0pClIVJuE8xTePS7RK0gChDSckvryEYj9xSeIXnU/4u5IpwoSDC+/SUA

> _______________________________________________
> Mailing list: https://launchpad.net/~fenics-ufc
> Post to     : [email-masked]
> Unsubscribe : https://launchpad.net/~fenics-ufc
> More help   : https://help.launchpad.net/ListHelp

---

From: Johannes Ring <[email-masked]>
Date: Mon, 20 Jun 2011 14:41:49 +0200

> Just go ahead and push.

Thanks. Done.

Johannes