ph10 2005/04/06 11:53:47 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/scripts os-type
Log:
Change scripts/os-type so that when "uname -s" returns just "GNU", the
answer is "GNU", and only if the return is "GNU/something" is the answer
"Linux".
Revision Changes Path
1.113 +4 -0 exim/exim-doc/doc-txt/ChangeLog
1.3 +5 -4 exim/exim-src/scripts/os-type
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog 6 Apr 2005 10:06:14 -0000 1.112
+++ ChangeLog 6 Apr 2005 10:53:47 -0000 1.113
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.112 2005/04/06 10:06:14 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.113 2005/04/06 10:53:47 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -153,6 +153,10 @@
PH/25 When debugging is enabled, the contents of the command line are added
to the debugging output, even when log_selector=+arguments is not
specified.
+
+PH/26 Change scripts/os-type so that when "uname -s" returns just "GNU", the
+ answer is "GNU", and only if the return is "GNU/something" is the answer
+ "Linux".
A note about Exim versions 4.44 and 4.50
Index: os-type
===================================================================
RCS file: /home/cvs/exim/exim-src/scripts/os-type,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- os-type 17 Feb 2005 10:04:41 -0000 1.2
+++ os-type 6 Apr 2005 10:53:47 -0000 1.3
@@ -1,5 +1,5 @@
#! /bin/sh
-# $Cambridge: exim/exim-src/scripts/os-type,v 1.2 2005/02/17 10:04:41 ph10 Exp $
+# $Cambridge: exim/exim-src/scripts/os-type,v 1.3 2005/04/06 10:53:47 ph10 Exp $
# Shell script to determine the operating system type. Some of the heuristics
# herein have accumulated over the years and may not strictly be needed now,
@@ -23,7 +23,8 @@
# Identify Glibc systems under different names.
-case "$os" in GNU|GNU/*|Linux) os=Linux;; esac
+case "$os" in GNU) os=GNU;; esac
+case "$os" in GNU/*|Linux) os=Linux;; esac
# It is believed that all systems respond to uname -s, but just in case
# there is one that doesn't, use the shell's $OSTYPE variable. It is known
@@ -149,9 +150,9 @@
# ELF soon.
NetBSD) if echo __ELF__ | ${CC-cc} -E - | grep -q __ELF__ ; then
- # Non-ELF system
- os="NetBSD-a.out"
- fi
+ # Non-ELF system
+ os="NetBSD-a.out"
+ fi
;;
esac
