Linux build updates

- A few Makefile changes to reflect current(?) paths on Linux
- Linux mail reader is /bin/mail

diff --git a/include/unixconf.h b/include/unixconf.h
index 125e72d8b387f71414bac1f29983ddfcbfc8b12e..442f02b2031f1abb1e6833bf7245254dc396546b 100644 (file)
--- a/include/unixconf.h
+++ b/include/unixconf.h
@@ -174,7 +174,7 @@
 #define DEF_MAILREADER "/usr/ucb/Mail"
 #  endif
 #else
-# if defined(SYSV) || defined(DGUX) || defined(HPUX)
+# if (defined(SYSV) || defined(DGUX) || defined(HPUX)) && !defined(LINUX)
 #  if defined(M_XENIX) || defined(__FreeBSD__)
 #define DEF_MAILREADER "/usr/bin/mail"
 #  else

diff --git a/sys/unix/Makefile.src b/sys/unix/Makefile.src
index 5f277a894c87d4cfcef85d2fb74237ef91c2d813..5346a7bbebc48df21e72e5b3824ba143c04df1a0 100644 (file)
--- a/sys/unix/Makefile.src
+++ b/sys/unix/Makefile.src
@@ -117,11 +117,11 @@ SYSOBJ = ioctl.o unixmain.o unixtty.o unixunix.o unixres.o
 
 # flags for Linux
 #   compile normally
-# CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11/include
-# LFLAGS = -L/usr/X11/lib
+# CFLAGS = -O2 -fomit-frame-pointer -I../include
+# LFLAGS = -L/usr/X11R6/lib
 #   OR compile backwards compatible a.out format
-# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
-# LFLAGS = -b i486-linuxaout -L/usr/X11/lib
+# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
+# LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib
 
 # flags for BeOS
 #   on a Mac/BeBox:
@@ -212,7 +212,7 @@ WINOBJ = $(WINTTYOBJ)
 # Systos needs -lcurses16 if you use -mshort
 # AIX 3.1 on RS/6000 likes -lcurses if TERMINFO defined in unixconf.h
 # and -ltermcap otherwise
-# Linux uses -ltermcap or -lncurses
+# Linux uses -lncurses (newer) or -ltermcap (older)
 # Be uses -ltermcap
 #
 # libraries for tty ports

diff --git a/sys/unix/Makefile.utl b/sys/unix/Makefile.utl
index 38a7fd6ac95af5af79cd9338dd0882f1dbad6ebf..3da3d53d949089462aa4451849c75dffdb30408d 100644 (file)
--- a/sys/unix/Makefile.utl
+++ b/sys/unix/Makefile.utl
@@ -72,11 +72,11 @@
 
 # flags for Linux
 #   compile normally
-# CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11/include
-# LFLAGS = -L/usr/X11/lib
+# CFLAGS = -O2 -fomit-frame-pointer -I../include
+# LFLAGS = -L/usr/X11R6/lib
 #   OR compile backwards compatible a.out format
-# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
-# LFLAGS = -b i486-linuxaout -L/usr/X11/lib
+# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
+# LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib
 
 # flags for BeOS using the command line
 # remember to uncomment flex and bison below