7238a35359
changes: Add parenthetical expressions to if Improve scoping of policies (see cmake_policy and CMP0011) Teach find_package more config file locations Many improved Find scripts in Modules Added an unset command Better reporting when nmake compiler environment is not correct
31 lines
1.1 KiB
Text
31 lines
1.1 KiB
Text
$NetBSD: patch-af,v 1.1 2009/04/07 10:42:14 drochner Exp $
|
|
|
|
--- Modules/CPack.RuntimeScript.in.orig 2009-03-31 13:42:52.000000000 +0200
|
|
+++ Modules/CPack.RuntimeScript.in
|
|
@@ -6,7 +6,7 @@ CWD="`dirname \"$0\"`"
|
|
TMP=/tmp/$UID/TemporaryItems
|
|
|
|
version=`sw_vers -productVersion`
|
|
-if [ "$?" == "0" ]; then
|
|
+if [ "$?" = "0" ]; then
|
|
major=${version%%\.*}
|
|
rest=${version#*\.}
|
|
minor=${rest%%\.*}
|
|
@@ -24,7 +24,7 @@ echo "Build = $build"
|
|
|
|
|
|
# if 10.5 or greater, then all the open-x11 stuff need not occur
|
|
-if ((( $major < 10 )) || ((( $major == 10)) && (( $minor < 5 )))); then
|
|
+if (expr \( $major \< 10 \) \| \( \( $major = 10 \) \& \( $minor \< 5 \) \)); then
|
|
version=`sw_vers -productVersion`
|
|
if [ "$?" = "0" ]; then
|
|
major=${version%%\.*}
|
|
@@ -44,7 +44,7 @@ echo "Build = $build"
|
|
|
|
|
|
# if 10.5 or greater, then all the open-x11 stuff need not occur
|
|
-if ((( $major < 10 )) || ((( $major == 10)) && (( $minor < 5 )))); then
|
|
+if (expr \( $major \< 10 \) \| \( \( $major = 10 \) \& \( $minor \< 5 \) \)); then
|
|
ps -wx -ocommand | grep -e '[X]11.app' > /dev/null
|
|
if [ "$?" != "0" -a ! -f ~/.xinitrc ]; then
|
|
echo "rm -f ~/.xinitrc" > ~/.xinitrc
|