Module Name: src
Committed By: mrg
Date: Sun Dec 13 09:01:46 UTC 2009
Modified Files:
src/lib/libpam: Makefile.inc
src/libexec/ld.elf_so: Makefile
src/share/mk: bsd.own.mk
Log Message:
if BSD_MK_COMPAT_FILE is defined, .include it.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/lib/libpam/Makefile.inc
cvs rdiff -u -r1.91 -r1.92 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r1.610 -r1.611 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/Makefile.inc
diff -u src/lib/libpam/Makefile.inc:1.11 src/lib/libpam/Makefile.inc:1.12
--- src/lib/libpam/Makefile.inc:1.11 Sun Dec 13 08:25:20 2009
+++ src/lib/libpam/Makefile.inc Sun Dec 13 09:01:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.11 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.12 2009/12/13 09:01:45 mrg Exp $
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -25,6 +25,11 @@
#
# $FreeBSD: src/lib/libpam/Makefile.inc,v 1.15 2004/03/15 13:23:20 des Exp $
+# This needs to be before bsd.init.mk
+.if defined(BSD_MK_COMPAT_FILE)
+.include <${BSD_MK_COMPAT_FILE}>
+.endif
+
USE_FORT?= yes # network client software *and* authentication software
.if defined(MLIBDIR)
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.91 src/libexec/ld.elf_so/Makefile:1.92
--- src/libexec/ld.elf_so/Makefile:1.91 Sun Dec 13 08:25:20 2009
+++ src/libexec/ld.elf_so/Makefile Sun Dec 13 09:01:45 2009
@@ -1,10 +1,15 @@
-# $NetBSD: Makefile,v 1.91 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: Makefile,v 1.92 2009/12/13 09:01:45 mrg Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
WARNS?=4
+# This needs to be before bsd.init.mk
+.if defined(BSD_MK_COMPAT_FILE)
+.include <${BSD_MK_COMPAT_FILE}>
+.endif
+
# We are not building this with PIE
PIE_CFLAGS=
PIE_LDFLAGS=
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.610 src/share/mk/bsd.own.mk:1.611
--- src/share/mk/bsd.own.mk:1.610 Sun Dec 13 03:06:22 2009
+++ src/share/mk/bsd.own.mk Sun Dec 13 09:01:46 2009
@@ -1,4 +1,9 @@
-# $NetBSD: bsd.own.mk,v 1.610 2009/12/13 03:06:22 nakayama Exp $
+# $NetBSD: bsd.own.mk,v 1.611 2009/12/13 09:01:46 mrg Exp $
+
+# This needs to be before bsd.init.mk
+.if defined(BSD_MK_COMPAT_FILE)
+.include <${BSD_MK_COMPAT_FILE}>
+.endif
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
