summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLloyd Hilaiel <lloyd@hilaiel.com>2010-03-25 11:08:38 -0600
committerLloyd Hilaiel <lloyd@hilaiel.com>2010-03-25 11:08:38 -0600
commit402d4a3c62fc96d75ad55439f39eea06d2f30e37 (patch)
treef9ec503ba7368838795ee54bf7686f8f57aeb7d4
parentd4afe025bc07d9d2df89130e0baeec1901890642 (diff)
downloadyajl-402d4a3c62fc96d75ad55439f39eea06d2f30e37.tar.gz
implement Vitali's suggestion of a *cmake* var for lib64 support rather than *environment* variable
-rw-r--r--BUILDING2
-rw-r--r--src/CMakeLists.txt8
2 files changed, 5 insertions, 5 deletions
diff --git a/BUILDING b/BUILDING
index 3974454..8460ed4 100644
--- a/BUILDING
+++ b/BUILDING
@@ -15,7 +15,7 @@ OR, attain CMake and build by hand:
4. make
5. build output left in yajl-X.Y.Z
-NOTE: for 64-bit systems where lib64 is used you can pass the environment
+NOTE: for 64-bit systems where lib64 is used you can pass the cmake
variable LIB_SUFFIX to cause installation into the system's 'lib64'
directory.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2298213..8c66465 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -77,9 +77,9 @@ ENDFOREACH (header ${PUB_HDRS})
INCLUDE_DIRECTORIES(${incDir}/..)
IF(NOT WIN32)
- # at build time you may specify LIB_SUFFIX to handle 64-bit systems which
- # use 'lib64'
- INSTALL(TARGETS yajl LIBRARY DESTINATION lib$ENV{LIB_SUFFIX})
- INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib$ENV{LIB_SUFFIX})
+ # at build time you may specify the cmake variable LIB_SUFFIX to handle
+ # 64-bit systems which use 'lib64'
+ INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX})
+ INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
INSTALL(DIRECTORY api/ DESTINATION include/yajl)
ENDIF()