since Makefile.inc is included at the end, do ENVDEF+= there

and use ENVDEF= in the Makefile (this was reversed).  Also, pull
in the right Makefile.inc for things that don't get installed
in usr.sbin.

8 files changed, 17 insertions, 18 deletions

diff --git a/gnu/usr.sbin/sendmail/libsmdb/Makefile b/gnu/usr.sbin/sendmail/libsmdb/Makefile
index a31f0be685d..e3964ecdf1a 100644
--- a/gnu/usr.sbin/sendmail/libsmdb/Makefile
+++ b/gnu/usr.sbin/sendmail/libsmdb/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2000/04/02 19:48:31 millert Exp $
+#	$OpenBSD: Makefile,v 1.3 2000/05/15 03:37:31 millert Exp $
 
 LIB=	smdb
 SRCS=	smdb.c smdb1.c smdb2.c smndbm.c
-ENVDEF+=-DNOT_SENDMAIL
+ENVDEF=	-DNOT_SENDMAIL
 
 # This is not a library that gets installed so only build the .a version
 NOPROFILE=1
diff --git a/gnu/usr.sbin/sendmail/libsmutil/Makefile b/gnu/usr.sbin/sendmail/libsmutil/Makefile
index c32c7a51ccf..6e1ce3cc1ff 100644
--- a/gnu/usr.sbin/sendmail/libsmutil/Makefile
+++ b/gnu/usr.sbin/sendmail/libsmutil/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2000/04/02 19:48:31 millert Exp $
+#	$OpenBSD: Makefile,v 1.3 2000/05/15 03:37:32 millert Exp $
 
 LIB=	smutil
 SRCS=	debug.c errstring.c lockfile.c safefile.c snprintf.c
-ENVDEF+=-DNOT_SENDMAIL
+ENVDEF=	-DNOT_SENDMAIL
 
 # This is not a library that gets installed so only build the .a version
 NOPROFILE=1
diff --git a/gnu/usr.sbin/sendmail/mail.local/Makefile b/gnu/usr.sbin/sendmail/mail.local/Makefile
index c44a3fadbf2..ba08e020eed 100644
--- a/gnu/usr.sbin/sendmail/mail.local/Makefile
+++ b/gnu/usr.sbin/sendmail/mail.local/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 2000/04/02 19:48:32 millert Exp $
+#	$OpenBSD: Makefile,v 1.3 2000/05/15 03:37:32 millert Exp $
 
 PROG=	mail.local
 MAN=	mail.local.8
 
 WANT_LIBSMUTIL=1
 
-.include "../../Makefile.inc"
+../../../libexec/Makefile.inc
 .include <bsd.prog.mk>
diff --git a/gnu/usr.sbin/sendmail/mailstats/Makefile b/gnu/usr.sbin/sendmail/mailstats/Makefile
index 8803ca26751..e4de6a2d3b4 100644
--- a/gnu/usr.sbin/sendmail/mailstats/Makefile
+++ b/gnu/usr.sbin/sendmail/mailstats/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2000/04/02 19:48:32 millert Exp $
+#	$OpenBSD: Makefile,v 1.3 2000/05/15 03:37:32 millert Exp $
 
 PROG=	mailstats
 MAN=	mailstats.8
-ENVDEF+=-DNOT_SENDMAIL
+ENVDEF=	-DNOT_SENDMAIL
 
 WANT_LIBSMUTIL=1
 
diff --git a/gnu/usr.sbin/sendmail/makemap/Makefile b/gnu/usr.sbin/sendmail/makemap/Makefile
index c8449c3f071..cf2aa0999ec 100644
--- a/gnu/usr.sbin/sendmail/makemap/Makefile
+++ b/gnu/usr.sbin/sendmail/makemap/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2000/04/02 19:48:32 millert Exp $
+#	$OpenBSD: Makefile,v 1.3 2000/05/15 03:37:32 millert Exp $
 
 PROG=	makemap
 MAN=	makemap.8
-ENVDEF+=-DNOT_SENDMAIL
+ENVDEF=	-DNOT_SENDMAIL
 
 WANT_LIBSMDB=1
 WANT_LIBSMUTIL=1
diff --git a/gnu/usr.sbin/sendmail/praliases/Makefile b/gnu/usr.sbin/sendmail/praliases/Makefile
index cad7d54543a..dbb66732423 100644
--- a/gnu/usr.sbin/sendmail/praliases/Makefile
+++ b/gnu/usr.sbin/sendmail/praliases/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2000/04/02 19:48:33 millert Exp $
+#	$OpenBSD: Makefile,v 1.3 2000/05/15 03:37:32 millert Exp $
 
 PROG=	praliases
 MAN=	praliases.1
-ENVDEF+=-DNOT_SENDMAIL
+ENVDEF=	-DNOT_SENDMAIL
 
 WANT_LIBSMDB=1
 WANT_LIBSMUTIL=1
diff --git a/gnu/usr.sbin/sendmail/rmail/Makefile b/gnu/usr.sbin/sendmail/rmail/Makefile
index 0b791aa65b0..5be7009ab9e 100644
--- a/gnu/usr.sbin/sendmail/rmail/Makefile
+++ b/gnu/usr.sbin/sendmail/rmail/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.2 2000/04/02 19:48:34 millert Exp $
+#	$OpenBSD: Makefile,v 1.3 2000/05/15 03:37:33 millert Exp $
 
 PROG=	rmail
 MAN=	rmail.8
 
 WANT_LIBSMUTIL=1
 
-.include "../../Makefile.inc"
+.include "../../../../bin/Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/gnu/usr.sbin/sendmail/smrsh/Makefile b/gnu/usr.sbin/sendmail/smrsh/Makefile
index 01ebf94562d..0c01b1478a3 100644
--- a/gnu/usr.sbin/sendmail/smrsh/Makefile
+++ b/gnu/usr.sbin/sendmail/smrsh/Makefile
@@ -1,11 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 2000/04/11 07:31:32 form Exp $
+#	$OpenBSD: Makefile,v 1.4 2000/05/15 03:37:33 millert Exp $
 
 PROG=	smrsh
 MAN=	smrsh.8
-ENVDEF+=-DNOT_SENDMAIL -DCMDDIR=\"/usr/libexec/sm.bin\"
-BINDIR=	/usr/libexec
+ENVDEF=	-DNOT_SENDMAIL -DCMDDIR=\"/usr/libexec/sm.bin\"
 
 WANT_LIBSMUTIL=1
 
-.include "../../Makefile.inc"
+.include "../../../libexec/Makefile.inc"
 .include <bsd.prog.mk>