From b9adfe2d6f7f13ef061e45e21b6b51003896ea29 Mon Sep 17 00:00:00 2001
From: Martin Beaudoin <beaudoin@ubuntu.(none)>
Date: Wed, 15 Dec 2010 17:26:41 -0800
Subject: [PATCH] ThirdParty packages: Fix typos for some .csh files. Add some
 comments in the etc/prefs.csh-EXAMPLE and etc/prefs.sh-EXAMPLE fles about QT

---
 ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec |  2 +-
 ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec  |  6 +++---
 etc/prefs.csh-EXAMPLE                         | 12 ++++++++++++
 etc/prefs.sh-EXAMPLE                          | 12 ++++++++++++
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec b/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec
index 15ebaa758..6cc6ca21f 100644
--- a/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec
+++ b/ThirdParty/rpmBuild/SPECS/ParaView-3.8.1.spec
@@ -233,7 +233,7 @@ cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.cs
 setenv PARAVIEW_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 setenv PARAVIEW_BIN_DIR \$PARAVIEW_DIR/bin
 setenv PARAVIEW_LIB_DIR \$PARAVIEW_DIR/lib
-setenv PARAVIEW_INCLUDE_DIR \$PARAVIEW_INCLUDE_DIR/include
+setenv PARAVIEW_INCLUDE_DIR \$PARAVIEW__DIR/include
 
 setenv PARAVIEW_VERSION %{version}
 
diff --git a/ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec b/ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec
index 14504a918..d9bb6602f 100644
--- a/ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec
+++ b/ThirdParty/rpmBuild/SPECS/openmpi-1.4.3.spec
@@ -204,8 +204,8 @@ setenv OPENMPI_COMPILE_FLAGS "\`mpicc --showme:compile\`"
 setenv OPENMPI_LINK_FLAGS "\`mpicc --showme:link\`"
 
 # Set the OpenFOAM compilation flags 
-setenv PINC \$OPENMPI_COMPILE_FLAGS
-setenv PLIBS \$OPENMPI_LINK_FLAGS
+setenv PINC "\$OPENMPI_COMPILE_FLAGS"
+setenv PLIBS "\$OPENMPI_LINK_FLAGS"
 
 
 if (\$?FOAM_VERBOSE && \$?prompt) then
@@ -221,7 +221,7 @@ if (\$?FOAM_VERBOSE && \$?prompt) then
     echo "    OPAL_PREFIX           : \$OPAL_PREFIX"
     echo "    PINC                  : \$PINC"
     echo "    PLIBS                 : \$PLIBS"
-fi
+endif
 DOT_CSH_EOF
 
 %clean
diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE
index e0b063355..7b71be49b 100644
--- a/etc/prefs.csh-EXAMPLE
+++ b/etc/prefs.csh-EXAMPLE
@@ -112,6 +112,18 @@
 # So we don't use a variable called QT_SYSTEM, but instead a variable
 # called QT_THIRD_PARTY in order to override to the ThirdParty QT
 # package.
+#
+# If you choose to use the system installed version of QT, keep
+# the variable QT_THIRD_PARTY commented, and uncomment the initialization
+# of the variable QT_DIR and QT_BIN_DIR. Make sure both variables are
+# properly initialized.
+#
+# If you choose instead to use the ThirdParty version of QT, only uncomment
+# the variable QT_THIRD_PARTY and set it to 1. Keep the initialization 
+# of the variables QT_DIR nd QT_BIN_DIR commented. The QT ThirdParty scripts
+# will take care of setting the variables QT_DIR and QT_BIN_DIR to the 
+# proper values.
+#
 #setenv QT_THIRD_PARTY 1
 #setenv QT_DIR path_to_system_installed_qt
 #setenv QT_BIN_DIR $QT_DIR/bin
diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE
index e2a65814f..07c6d2294 100644
--- a/etc/prefs.sh-EXAMPLE
+++ b/etc/prefs.sh-EXAMPLE
@@ -114,6 +114,18 @@ compilerInstall=system
 # So we don't use a variable called QT_SYSTEM, but instead a variable
 # called QT_THIRD_PARTY in order to override to the ThirdParty QT
 # package.
+#
+# If you choose to use the system installed version of QT, keep
+# the variable QT_THIRD_PARTY commented, and uncomment the initialization
+# of the variable QT_DIR and QT_BIN_DIR. Make sure both variables are
+# properly initialized.
+#
+# If you choose instead to use the ThirdParty version of QT, only uncomment
+# the variable QT_THIRD_PARTY and set it to 1. Keep the initialization 
+# of the variables QT_DIR nd QT_BIN_DIR commented. The QT ThirdParty scripts
+# will take care of setting the variables QT_DIR and QT_BIN_DIR to the 
+# proper values.
+#
 #export QT_THIRD_PARTY=1
 #export QT_DIR=path_to_system_installed_qt
 #export QT_BIN_DIR=$QT_DIR/bin
-- 
2.11.4.GIT