summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorbrook <brook@pkgsrc.org>2011-09-17 19:04:43 +0000
committerbrook <brook@pkgsrc.org>2011-09-17 19:04:43 +0000
commit6d9ad9ff3ef1df11c9b3446d4bf4583925559056 (patch)
treef946b74bc9a2ad5ccdf7f91deadef5d959fe1ac3 /mk
parentd20e33ac80dca0d78c30f3e4687bb257efcef060 (diff)
downloadpkgsrc-6d9ad9ff3ef1df11c9b3446d4bf4583925559056.tar.gz
Replace hard-coded paths to /usr/pkg with $ENV{BUILDLINK_DIR} and remove
a hard-coded path to /usr/local/bin altogether. This usage is consistent with other paths already in the same file.
Diffstat (limited to 'mk')
-rw-r--r--mk/cmake-Modules/Platform/UnixPaths.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/cmake-Modules/Platform/UnixPaths.cmake b/mk/cmake-Modules/Platform/UnixPaths.cmake
index 4154494b76a..4c6c8985bff 100644
--- a/mk/cmake-Modules/Platform/UnixPaths.cmake
+++ b/mk/cmake-Modules/Platform/UnixPaths.cmake
@@ -5,7 +5,7 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
# Standard
- / /usr /usr/pkg
+ / /usr $ENV{BUILDLINK_DIR}
)
SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH}
@@ -20,7 +20,7 @@ SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
)
SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
- /bin /usr/bin /usr/local/bin /usr/pkg/bin /sbin
+ /bin /usr/bin $ENV{BUILDLINK_DIR}/bin /sbin
)
LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES