Linux portability changes

SCCS-vsn: usr.sbin/sendmail/src/Makefiles/Makefile.Linux 8.4
SCCS-vsn: usr.sbin/sendmail/src/conf.c 8.81

diff --git a/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.Linux b/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.Linux
index 0ee0fbb..e16c5d3 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.Linux
+++ b/usr/src/usr.sbin/sendmail/src/Makefiles/Makefile.Linux
@@ -7,7 +7,7 @@
 #
 #  This has been tested on Linux 0.99p10.
 #
 #
 #  This has been tested on Linux 0.99p10.
 #

-#      @(#)Makefile.Linux      8.3 (Berkeley) %G%
+#      @(#)Makefile.Linux      8.4 (Berkeley) %G%

 #
 
 # use O=-O (usual) or O=-g (debugging)
 #
 
 # use O=-O (usual) or O=-g (debugging)


@@ -28,19 +28,19 @@ ENVDEF=
 # see also conf.h for additional compilation flags
 
 # include directories
 # see also conf.h for additional compilation flags
 
 # include directories

-INCDIRS=-I/usr/LOCAL/include
+INCDIRS=-I/usr/local/include

 
 # library directories
 
 # library directories

-LIBDIRS=-L/usr/LOCAL/lib
+LIBDIRS=-L/usr/local/lib

 
 # libraries required on your system
 
 # libraries required on your system

-LIBS=  -lresolv
+LIBS=  -lndbm

 
 # location of sendmail binary (usually /usr/sbin or /usr/lib)
 
 # location of sendmail binary (usually /usr/sbin or /usr/lib)

-BINDIR=        ${DESTDIR}/usr/lib
+BINDIR=        ${DESTDIR}/usr/sbin

 
 # location of sendmail.st file (usually /var/log or /usr/lib)
 
 # location of sendmail.st file (usually /var/log or /usr/lib)

-STDIR= ${DESTDIR}/usr/lib
+STDIR= ${DESTDIR}/etc

 
 # location of sendmail.hf file (usually /usr/share/misc or /usr/lib)
 HFDIR= ${DESTDIR}/usr/lib
 
 # location of sendmail.hf file (usually /usr/share/misc or /usr/lib)
 HFDIR= ${DESTDIR}/usr/lib


@@ -104,10 +104,10 @@ install-sendmail: sendmail
        install -c -o ${BINOWN} -g ${BINGRP} -m 444 sendmail.hf ${HFDIR}
 
 # doesn't actually install them -- you may want to install pre-nroff versions
        install -c -o ${BINOWN} -g ${BINGRP} -m 444 sendmail.hf ${HFDIR}
 
 # doesn't actually install them -- you may want to install pre-nroff versions

-install-docs: aliases.0 newaliases.0 sendmail.0
+install-docs: aliases.0 mailq.0 newaliases.0 sendmail.0

 
 clean:
 
 clean:

-       rm -f ${OBJS} sendmail aliases.0 newaliases.0 sendmail.0
+       rm -f ${OBJS} sendmail aliases.0 mailq.0 newaliases.0 sendmail.0

 
 # dependencies
 #   gross overkill, and yet still not quite enough....
 
 # dependencies
 #   gross overkill, and yet still not quite enough....

diff --git a/usr/src/usr.sbin/sendmail/src/conf.c b/usr/src/usr.sbin/sendmail/src/conf.c
index c3a10aa..c7aabdf 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/conf.c
+++ b/usr/src/usr.sbin/sendmail/src/conf.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)conf.c     8.80 (Berkeley) %G%";
+static char sccsid[] = "@(#)conf.c     8.81 (Berkeley) %G%";

 #endif /* not lint */
 
 # include "sendmail.h"
 #endif /* not lint */
 
 # include "sendmail.h"


@@ -802,7 +802,7 @@ getla()
 
 
 #else
 
 
 #else

-#if LA_TYPE == LA_PROC
+#if LA_TYPE == LA_PROCSTR

 
 /*
 **  Read /proc/loadavg for the load average.  This is assumed to be
 
 /*
 **  Read /proc/loadavg for the load average.  This is assumed to be


@@ -823,8 +823,6 @@ getla()
        register int result;
        static FILE *fp = NULL;
 
        register int result;
        static FILE *fp = NULL;
 

-       avenrun = 0.0;
-

        if (fp == NULL)
        {
                fp = fopen(_PATH_LOADAVG, "r");
        if (fp == NULL)
        {
                fp = fopen(_PATH_LOADAVG, "r");