From 1e886749b5e3a8ad27ec4ddbebde47cd08183434 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 23 Jan 2012 13:16:51 +0000 Subject: [PATCH] * Don't replace /opt if it's followed by something other than whitespace or a /, otherwise strings such as /foo/opticaldrive.c will be broken. svn path=/nixpkgs/branches/stdenv-updates/; revision=31793 --- pkgs/development/tools/build-managers/cmake/setup-hook.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 8fdf64417dd3..802c7343a854 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -3,10 +3,11 @@ addCMakeParams() { } fixCmakeFiles() { + # Replace occurences of /usr and /opt by /var/empty. echo "fixing cmake files..." find "$1" \( -type f -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt \) -print | while read fn; do - sed -e 's|/usr|/var/empty|g' -e 's|/opt|/var/empty|g' < "$fn" > "$fn.tmp" + sed -e 's^/usr\([ /]\|$\)^/var/empty\1^g' -e 's^/opt\([ /]\|$\)^/var/empty\1^g' < "$fn" > "$fn.tmp" mv "$fn.tmp" "$fn" done }