Update of /cvsroot/monetdb/buildtools/conf
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12522/buildtools/conf
Modified Files:
Tag: MonetDB_1-20
MonetDB.m4
Log Message:
(hopefully) fixing
[ 1798695 ] Mtest.py error: LINUX_DIST is not defined
http://sourceforge.net/tracker/index.php?func=detail&aid=1798695&group_id=56967&atid=482468
generalized Linux distribution recognition on SuSE
Index: MonetDB.m4
===================================================================
RCS file: /cvsroot/monetdb/buildtools/conf/MonetDB.m4,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -u -d -r1.37.2.1 -r1.37.2.2
--- MonetDB.m4 18 Sep 2007 20:55:05 -0000 1.37.2.1
+++ MonetDB.m4 21 Sep 2007 08:23:57 -0000 1.37.2.2
@@ -563,10 +563,10 @@
| sed 's|^\(Scientific\) Linux SL release \([[0-9]][[^
\n]]*\)\( .*\)*$|\1:\2|'`"
elif test -s /etc/SuSE-release ; then
LINUX_DIST="`cat /etc/SuSE-release | head -n1 \
- | sed 's|^.*\(SUSE\) LINUX Enterprise
\([[SD]]\)[[ervsktop]]* \([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\3E\2|' \
- | sed 's|^SUSE LINUX Enterprise \([[SD]]\)[[ervsktop]]*
\([[0-9]][[^ \n]]*\)\( .*\)*$|SLE\1:\2|' \
- | sed 's|^.*\(SuSE\) Linux.* \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|' \
- | sed 's|^open\(SUSE\) \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
+ | sed 's|^.*\(S[[Uu]]SE\) LINUX Enterprise
\([[SD]]\)[[ervsktop]]* \([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\3E\2|' \
+ | sed 's|^S[[Uu]]SE LINUX Enterprise
\([[SD]]\)[[ervsktop]]* \([[0-9]][[^ \n]]*\)\( .*\)*$|SLE\1:\2|' \
+ | sed 's|^.*\(S[[Uu]]SE\)
[[Ll]][[Ii]][[Nn]][[Uu]][[Xx]].* \([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|' \
+ | sed 's|^open\(S[[Uu]]SE\) \([[0-9]][[^ \n]]*\)\(
.*\)*$|\1:\2|'`"
elif test -s /etc/gentoo-release ; then
LINUX_DIST="`cat /etc/gentoo-release | head -n1 \
| sed 's|^.*\(Gentoo\) Base System.*
[[versionrelease]]* \([[0-9]][[^ \n]]*\)\( .*\)*$|\1:\2|'`"
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
