install

svn path=/trunk/mono/; revision=86125

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ae6330669f76f30915b88379f9e47e6c535d243f..68e159f8a8e49363763b7d2b930ee5922cbdaa0f 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -5,7 +5,8 @@ bin_SCRIPTS = \
        $(scripts_2_1)          \
        $(scripts_service)      \
        $(scripts_nunit)        \
-       $(scripts_rpmhelpers)
+       $(scripts_rpmhelpers)   \
+       mono-test-install
 
 scripts_1_0 = \
        al                      \

diff --git a/scripts/mono-test-install b/scripts/mono-test-install
new file mode 100755 (executable)
index 0000000..442e54e
--- /dev/null
+++ b/scripts/mono-test-install
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# Does various checks for people that we can use to diagnose
+# an end user installation
+#
+set `echo $PATH | sed 's/:/ /g'`
+
+while test x$1 != x; do
+    if test -x $1/mono; then
+       if test x$monocmd = x; then
+          monocmd=$1/mono
+        else
+          other_monos="$1/mono $other_monos"
+       fi
+    fi
+    shift
+done
+
+echo Active Mono: $monocmd
+
+if test "x$other_monos" != x; then
+       echo "Other Mono executables: $other_monos"
+fi
+
+
+#
+# Check that the pkg-config mono points to this mono
+#
+if pkg-config --modversion mono >& /dev/null; then 
+        pkg_config_mono=`(cd \`pkg-config --variable prefix mono\`/bin; pwd)`/mono
+       if test $pkg_config_mono != $monocmd; then
+           echo "Error: pkg-config Mono installation points to a different install"
+           echo "       than the Mono found:"
+           echo "       Mono on PATH: $monocmd"
+           echo "       Mono from pkg-config: $pkg_config_mono"
+           exit 1
+       fi
+else 
+        echo "Warning: pkg-config could not find mono installed on this system"
+fi
+

diff --git a/scripts/mono-test-install.sh b/scripts/mono-test-install.sh
deleted file mode 100755 (executable)
index 442e54e..0000000
--- a/scripts/mono-test-install.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# Does various checks for people that we can use to diagnose
-# an end user installation
-#
-set `echo $PATH | sed 's/:/ /g'`
-
-while test x$1 != x; do
-    if test -x $1/mono; then
-       if test x$monocmd = x; then
-          monocmd=$1/mono
-        else
-          other_monos="$1/mono $other_monos"
-       fi
-    fi
-    shift
-done
-
-echo Active Mono: $monocmd
-
-if test "x$other_monos" != x; then
-       echo "Other Mono executables: $other_monos"
-fi
-
-
-#
-# Check that the pkg-config mono points to this mono
-#
-if pkg-config --modversion mono >& /dev/null; then 
-        pkg_config_mono=`(cd \`pkg-config --variable prefix mono\`/bin; pwd)`/mono
-       if test $pkg_config_mono != $monocmd; then
-           echo "Error: pkg-config Mono installation points to a different install"
-           echo "       than the Mono found:"
-           echo "       Mono on PATH: $monocmd"
-           echo "       Mono from pkg-config: $pkg_config_mono"
-           exit 1
-       fi
-else 
-        echo "Warning: pkg-config could not find mono installed on this system"
-fi
-