diff --git a/include/unixconf.h b/include/unixconf.h index 125e72d8b..442f02b20 100644 --- 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 5f277a894..5346a7bbe 100644 --- 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 38a7fd6ac..3da3d53d9 100644 --- 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