Merge remote branch 'OpenCFD/master' into olesenm

Conflicts:
	bin/foamExec

bin/foamEtcFile

@@ -82,6 +82,9 @@ mode=ugo
 prefix="$WM_PROJECT_INST_DIR"
 version="$WM_PROJECT_VERSION"
 
+# default naming convention is "OpenFOAM-<VERSION>"
+projectNamePrefix="${WM_PROJECT:-OpenFOAM}-"
+
 
 unset listOpt quietOpt
 # parse options
@@ -132,6 +135,23 @@ do
     esac
 done
 
+
+#
+# handle standard and debian naming convention
+#
+case "$version" in
+OpenFOAM-*)         # standard naming convention OpenFOAM-<VERSION>
+    projectNamePrefix="OpenFOAM-"
+    version="${version##OpenFOAM-}"
+    ;;
+
+openfoam[0-9]*)     # debian naming convention 'openfoam<VERSION>'
+    projectNamePrefix="openfoam"
+    version="${version##openfoam}"
+    ;;
+esac
+
+
 # Save the essential bits of information:
 nArgs=$#
 fileName="$1"
@@ -154,7 +174,7 @@ esac
 
 case "$mode" in
 *o*)  # other (shipped)
-    dirList="$dirList $prefix/${WM_PROJECT:-OpenFOAM}-$version/etc"
+    dirList="$dirList $prefix/$projectNamePrefix$version/etc"
     ;;
 esac
 set -- $dirList