* bootstrap: don't check /etc/redhat-release if it doesn't exist (which is

  the case on all non Red Hat Linux systems)

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 962c54bf86b105feee192de7e6ba5a2a1488c7ae..6fccc8d09ab2619361bc3b767a3b1d2cd1d6217d 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,8 @@
  $Log$
+ Revision 601.110  2003/01/15 16:34:53  ajc
+ * bootstrap: don't check /etc/redhat-release if it doesn't exist (which is
+   the case on all non Red Hat Linux systems)
+
  Revision 601.109  2003/01/15 05:57:09  ajc
  * First cut at static-linking the citserver.  Ripped out libtool and
    replaced the dynloader paradigm with "server extensions" paradigm (static
@@ -4377,4 +4381,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/bootstrap b/citadel/bootstrap
index c6910888fbd1de7d740bb5e7359e9e398f70dd5b..998f9be708f190befd74097503cd9eb9f0263bc8 100755 (executable)
--- a/citadel/bootstrap
+++ b/citadel/bootstrap
@@ -6,7 +6,11 @@
 #
 
 # Goofy red hat 7.3 stuff
-[ `cut -f 5 -d ' ' /etc/redhat-release` = 7.3 ] && redhat73=true
+if [ -s /etc/redhat-release ] ; then
+       [ `cut -f 5 -d ' ' /etc/redhat-release` = 7.3 ] && redhat73=true
+else
+       redhat73=false
+fi
 if [ "$redhat73" = "true" ]; then
        aclocal=/usr/bin/aclocal-1.5
        autoconf=/usr/bin/autoconf-2.53