Module Name: src
Committed By: mrg
Date: Mon Dec 14 06:29:20 UTC 2009
Modified Files:
src/lib/csu [matt-nb5-mips64]: Makefile
src/lib/i18n_module [matt-nb5-mips64]: Makefile.inc
src/lib/libarch [matt-nb5-mips64]: Makefile
src/lib/libarch/i386 [matt-nb5-mips64]: Makefile.inc
src/lib/libarch/x86_64 [matt-nb5-mips64]: Makefile.inc
src/lib/libpam [matt-nb5-mips64]: Makefile.inc
src/lib/libpam/modules [matt-nb5-mips64]: mod.mk
Log Message:
s/LD32DIR/MLIBDIR/ in most places, also look for CSU_MACHINE_ARCH.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.24.46.1 src/lib/csu/Makefile
cvs rdiff -u -r1.10 -r1.10.8.1 src/lib/i18n_module/Makefile.inc
cvs rdiff -u -r1.21 -r1.21.8.1 src/lib/libarch/Makefile
cvs rdiff -u -r1.13 -r1.13.8.1 src/lib/libarch/i386/Makefile.inc
cvs rdiff -u -r1.3 -r1.3.8.1 src/lib/libarch/x86_64/Makefile.inc
cvs rdiff -u -r1.8 -r1.8.8.1 src/lib/libpam/Makefile.inc
cvs rdiff -u -r1.6 -r1.6.8.1 src/lib/libpam/modules/mod.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/csu/Makefile
diff -u src/lib/csu/Makefile:1.24 src/lib/csu/Makefile:1.24.46.1
--- src/lib/csu/Makefile:1.24 Thu May 2 16:42:53 2002
+++ src/lib/csu/Makefile Mon Dec 14 06:29:20 2009
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2002/05/02 16:42:53 wiz Exp $
+# $NetBSD: Makefile,v 1.24.46.1 2009/12/14 06:29:20 mrg Exp $
.include <bsd.own.mk>
-.if ${OBJECT_FMT} == "ELF" && exists(${MACHINE_ARCH}_elf)
+.if ${OBJECT_FMT} == "ELF" && exists(${CSU_MACHINE_ARCH}_elf)
+SUBDIR= ${CSU_MACHINE_ARCH}_elf
+.elif ${OBJECT_FMT} == "ELF" && exists(${MACHINE_ARCH}_elf)
SUBDIR= ${MACHINE_ARCH}_elf
.elif ${OBJECT_FMT} == "ELF" && exists(${MACHINE_CPU}_elf)
SUBDIR= ${MACHINE_CPU}_elf
Index: src/lib/i18n_module/Makefile.inc
diff -u src/lib/i18n_module/Makefile.inc:1.10 src/lib/i18n_module/Makefile.inc:1.10.8.1
--- src/lib/i18n_module/Makefile.inc:1.10 Sun Oct 26 07:06:07 2008
+++ src/lib/i18n_module/Makefile.inc Mon Dec 14 06:29:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.10 2008/10/26 07:06:07 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.10.8.1 2009/12/14 06:29:20 mrg Exp $
NOLINT= # defined
NOPICINSTALL= # defined
@@ -7,10 +7,10 @@
.include <bsd.own.mk>
SHLIB_VERSION_FILE= ${NETBSDSRCDIR}/lib/i18n_module/shlib_version
-.if defined(LD32DIR)
-LIBDIR= /usr/lib/${LD32DIR}/i18n
-SHLIBDIR= /usr/lib/${LD32DIR}/i18n
-SHLIBINSTALLDIR=/usr/lib/${LD32DIR}/i18n
+.if defined(MLIBDIR)
+LIBDIR= /usr/lib/${MLIBDIR}/i18n
+SHLIBDIR= /usr/lib/${MLIBDIR}/i18n
+SHLIBINSTALLDIR=/usr/lib/${MLIBDIR}/i18n
.else
LIBDIR= /usr/lib/i18n
SHLIBDIR= /usr/lib/i18n
Index: src/lib/libarch/Makefile
diff -u src/lib/libarch/Makefile:1.21 src/lib/libarch/Makefile:1.21.8.1
--- src/lib/libarch/Makefile:1.21 Sun Oct 26 07:05:33 2008
+++ src/lib/libarch/Makefile Mon Dec 14 06:29:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/10/26 07:05:33 mrg Exp $
+# $NetBSD: Makefile,v 1.21.8.1 2009/12/14 06:29:20 mrg Exp $
# These should always be a MACHINE_CPU value
ARCHDIRS= alpha arm i386 m68k sparc x86_64
@@ -14,8 +14,8 @@
# Build the library if SRCS is now defined ...
.if defined(SRCS)
-.if defined(LD32DIR) && ${LD32DIR} != "none"
-LIB= ${LD32DIR}
+.if defined(MLIBDIR) && ${MLIBDIR} != "none"
+LIB= ${MLIBDIR}
.else
LIB= ${MACHINE_CPU}
.endif
Index: src/lib/libarch/i386/Makefile.inc
diff -u src/lib/libarch/i386/Makefile.inc:1.13 src/lib/libarch/i386/Makefile.inc:1.13.8.1
--- src/lib/libarch/i386/Makefile.inc:1.13 Sun Oct 26 07:05:33 2008
+++ src/lib/libarch/i386/Makefile.inc Mon Dec 14 06:29:20 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.13 2008/10/26 07:05:33 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.13.8.1 2009/12/14 06:29:20 mrg Exp $
-LD32DIR?= none
+MLIBDIR?= none
-.if (${MACHINE_ARCH} == "i386" || ${LD32DIR} == "i386")
+.if (${MACHINE_ARCH} == "i386" || ${MLIBDIR} == "i386")
SRCS+= i386_get_ldt.c i386_set_ldt.c \
i386_iopl.c i386_get_ioperm.c i386_set_ioperm.c \
i386_vm86.c i386_pmc.c i386_mtrr.c
Index: src/lib/libarch/x86_64/Makefile.inc
diff -u src/lib/libarch/x86_64/Makefile.inc:1.3 src/lib/libarch/x86_64/Makefile.inc:1.3.8.1
--- src/lib/libarch/x86_64/Makefile.inc:1.3 Sun Oct 26 07:05:33 2008
+++ src/lib/libarch/x86_64/Makefile.inc Mon Dec 14 06:29:20 2009
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.3 2008/10/26 07:05:33 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.3.8.1 2009/12/14 06:29:20 mrg Exp $
-LD32DIR?= none
+MLIBDIR?= none
-.if (${MACHINE_ARCH} == "x86_64" && ${LD32DIR} != "i386")
+.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR} != "i386")
SRCS+= x86_64_mtrr.c x86_64_iopl.c
.endif
Index: src/lib/libpam/Makefile.inc
diff -u src/lib/libpam/Makefile.inc:1.8 src/lib/libpam/Makefile.inc:1.8.8.1
--- src/lib/libpam/Makefile.inc:1.8 Sun May 11 19:17:07 2008
+++ src/lib/libpam/Makefile.inc Mon Dec 14 06:29:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.8 2008/05/11 19:17:07 he Exp $
+# $NetBSD: Makefile.inc,v 1.8.8.1 2009/12/14 06:29:20 mrg Exp $
# Copyright 1998 Juniper Networks, Inc.
# All rights reserved.
#
@@ -27,7 +27,18 @@
USE_FORT?= yes # network client software *and* authentication software
-CPPFLAGS+= -DOPENPAM_MODULES_DIR=\"/usr/lib/security\"
+# This needs to be before bsd.init.mk
+.if defined(BSD_MK_COMPAT_FILE)
+.include <${BSD_MK_COMPAT_FILE}>
+.endif
+
+.if defined(MLIBDIR)
+MODLIBDIR=/usr/lib/${MLIBDIR}/security
+.else
+MODLIBDIR=/usr/lib/security
+.endif
+
+CPPFLAGS+= -DOPENPAM_MODULES_DIR=\"${MODLIBDIR}\"
# No debugging
#CPPFLAGS+= -DDEBUG
Index: src/lib/libpam/modules/mod.mk
diff -u src/lib/libpam/modules/mod.mk:1.6 src/lib/libpam/modules/mod.mk:1.6.8.1
--- src/lib/libpam/modules/mod.mk:1.6 Mon Oct 27 07:48:27 2008
+++ src/lib/libpam/modules/mod.mk Mon Dec 14 06:29:20 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mod.mk,v 1.6 2008/10/27 07:48:27 mrg Exp $
+# $NetBSD: mod.mk,v 1.6.8.1 2009/12/14 06:29:20 mrg Exp $
NOLINT= # don't build a lint library
NOPROFILE= # don't build a profile library
@@ -8,8 +8,8 @@
.include "${.CURDIR}/../../Makefile.inc"
-.if defined(LD32DIR)
-LIBDIR=/usr/lib/${LD32DIR}/security
+.if defined(MLIBDIR)
+LIBDIR=/usr/lib/${MLIBDIR}/security
.else
LIBDIR=/usr/lib/security
.endif
