From ea72ce4e68ff79a2be0f5950aecfbbf809fd6afa Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Mon, 9 Sep 2013 06:02:30 +0000
Subject: Remove unneeded mappings from libmap32.conf.  Move it up one level
 and install it on powerpc64 in addition to amd64.

Reviewed by:	kib
Approved by:	re (blanket)
---
 etc/Makefile                | 4 ++--
 etc/etc.amd64/libmap32.conf | 4 ----
 etc/libmap32.conf           | 2 ++
 3 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 100644 etc/etc.amd64/libmap32.conf
 create mode 100644 etc/libmap32.conf

(limited to 'etc')

diff --git a/etc/Makefile b/etc/Makefile
index 2210cc6..b6e1e37 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -50,8 +50,8 @@ BIN1=	crontab \
 	syslog.conf \
 	termcap.small
 
-.if ${MACHINE} == "amd64"
-BIN1+=	etc.${MACHINE}/libmap32.conf
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+BIN1+=	libmap32.conf
 .endif
 
 .if exists(${.CURDIR}/etc.${MACHINE}/ttys)
diff --git a/etc/etc.amd64/libmap32.conf b/etc/etc.amd64/libmap32.conf
deleted file mode 100644
index 6096e21..0000000
--- a/etc/etc.amd64/libmap32.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $FreeBSD$
-/lib			/lib32
-/usr/lib		/usr/lib32
-/usr/lib/private	/usr/lib32/private
diff --git a/etc/libmap32.conf b/etc/libmap32.conf
new file mode 100644
index 0000000..07fb138
--- /dev/null
+++ b/etc/libmap32.conf
@@ -0,0 +1,2 @@
+# $FreeBSD$
+/usr/lib/private	/usr/lib32/private
-- 
cgit v1.1