Use USE_LINUX_PREFIX instead of PREFIX?= ${LINUXBASE} and NO_MTREE.

PR:		99320
Submitted by:	gabor
Approved by:	netchild (mentor)

10 files changed, 10 insertions, 20 deletions

diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile
index c0be58a9f4d5..05e228822016 100644
--- a/emulators/linux_base-c6/Makefile
+++ b/emulators/linux_base-c6/Makefile
@@ -98,9 +98,8 @@ CONFLICTS=		linux_base-7* linux_base-deb* linux_base-gentoo* \
 			linux_base-fc3 linux-libgcc* linux_locale*
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
-PREFIX?=		${LINUXBASE}
+USE_LINUX_PREFIX=	yes
 NO_FILTER_SHLIBS=	yes
-NO_MTREE=		yes
 NO_WRKSUBDIR=		yes
 MD5_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST_SUB=		GLIBCVER="2.3.6"
diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile
index c0be58a9f4d5..05e228822016 100644
--- a/emulators/linux_base-f10/Makefile
+++ b/emulators/linux_base-f10/Makefile
@@ -98,9 +98,8 @@ CONFLICTS=		linux_base-7* linux_base-deb* linux_base-gentoo* \
 			linux_base-fc3 linux-libgcc* linux_locale*
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
-PREFIX?=		${LINUXBASE}
+USE_LINUX_PREFIX=	yes
 NO_FILTER_SHLIBS=	yes
-NO_MTREE=		yes
 NO_WRKSUBDIR=		yes
 MD5_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST_SUB=		GLIBCVER="2.3.6"
diff --git a/emulators/linux_base-f7/Makefile b/emulators/linux_base-f7/Makefile
index c0be58a9f4d5..05e228822016 100644
--- a/emulators/linux_base-f7/Makefile
+++ b/emulators/linux_base-f7/Makefile
@@ -98,9 +98,8 @@ CONFLICTS=		linux_base-7* linux_base-deb* linux_base-gentoo* \
 			linux_base-fc3 linux-libgcc* linux_locale*
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
-PREFIX?=		${LINUXBASE}
+USE_LINUX_PREFIX=	yes
 NO_FILTER_SHLIBS=	yes
-NO_MTREE=		yes
 NO_WRKSUBDIR=		yes
 MD5_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST_SUB=		GLIBCVER="2.3.6"
diff --git a/emulators/linux_base-f8/Makefile b/emulators/linux_base-f8/Makefile
index c0be58a9f4d5..05e228822016 100644
--- a/emulators/linux_base-f8/Makefile
+++ b/emulators/linux_base-f8/Makefile
@@ -98,9 +98,8 @@ CONFLICTS=		linux_base-7* linux_base-deb* linux_base-gentoo* \
 			linux_base-fc3 linux-libgcc* linux_locale*
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
-PREFIX?=		${LINUXBASE}
+USE_LINUX_PREFIX=	yes
 NO_FILTER_SHLIBS=	yes
-NO_MTREE=		yes
 NO_WRKSUBDIR=		yes
 MD5_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST_SUB=		GLIBCVER="2.3.6"
diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile
index c0be58a9f4d5..05e228822016 100644
--- a/emulators/linux_base-f9/Makefile
+++ b/emulators/linux_base-f9/Makefile
@@ -98,9 +98,8 @@ CONFLICTS=		linux_base-7* linux_base-deb* linux_base-gentoo* \
 			linux_base-fc3 linux-libgcc* linux_locale*
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
-PREFIX?=		${LINUXBASE}
+USE_LINUX_PREFIX=	yes
 NO_FILTER_SHLIBS=	yes
-NO_MTREE=		yes
 NO_WRKSUBDIR=		yes
 MD5_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST_SUB=		GLIBCVER="2.3.6"
diff --git a/emulators/linux_base-f9/linux_base-f8/Makefile b/emulators/linux_base-f9/linux_base-f8/Makefile
index c0be58a9f4d5..05e228822016 100644
--- a/emulators/linux_base-f9/linux_base-f8/Makefile
+++ b/emulators/linux_base-f9/linux_base-f8/Makefile
@@ -98,9 +98,8 @@ CONFLICTS=		linux_base-7* linux_base-deb* linux_base-gentoo* \
 			linux_base-fc3 linux-libgcc* linux_locale*
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
-PREFIX?=		${LINUXBASE}
+USE_LINUX_PREFIX=	yes
 NO_FILTER_SHLIBS=	yes
-NO_MTREE=		yes
 NO_WRKSUBDIR=		yes
 MD5_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST_SUB=		GLIBCVER="2.3.6"
diff --git a/emulators/linux_base-fc3/Makefile b/emulators/linux_base-fc3/Makefile
index 8599fe56b854..0bae9bb7d782 100644
--- a/emulators/linux_base-fc3/Makefile
+++ b/emulators/linux_base-fc3/Makefile
@@ -98,9 +98,8 @@ EXPIRATION_DATE=2006-07-01
 
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
-PREFIX?=		${LINUXBASE}
+USE_LINUX_PREFIX=	yes
 NO_FILTER_SHLIBS=	yes
-NO_MTREE=		yes
 NO_WRKSUBDIR=		yes
 MD5_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST_SUB=		GLIBCVER="2.3.6"
diff --git a/emulators/linux_base-fc4/Makefile b/emulators/linux_base-fc4/Makefile
index c0be58a9f4d5..05e228822016 100644
--- a/emulators/linux_base-fc4/Makefile
+++ b/emulators/linux_base-fc4/Makefile
@@ -98,9 +98,8 @@ CONFLICTS=		linux_base-7* linux_base-deb* linux_base-gentoo* \
 			linux_base-fc3 linux-libgcc* linux_locale*
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
-PREFIX?=		${LINUXBASE}
+USE_LINUX_PREFIX=	yes
 NO_FILTER_SHLIBS=	yes
-NO_MTREE=		yes
 NO_WRKSUBDIR=		yes
 MD5_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST_SUB=		GLIBCVER="2.3.6"
diff --git a/emulators/linux_base-fc6/Makefile b/emulators/linux_base-fc6/Makefile
index c0be58a9f4d5..05e228822016 100644
--- a/emulators/linux_base-fc6/Makefile
+++ b/emulators/linux_base-fc6/Makefile
@@ -98,9 +98,8 @@ CONFLICTS=		linux_base-7* linux_base-deb* linux_base-gentoo* \
 			linux_base-fc3 linux-libgcc* linux_locale*
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
-PREFIX?=		${LINUXBASE}
+USE_LINUX_PREFIX=	yes
 NO_FILTER_SHLIBS=	yes
-NO_MTREE=		yes
 NO_WRKSUBDIR=		yes
 MD5_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST_SUB=		GLIBCVER="2.3.6"
diff --git a/emulators/linux_base-fc7/Makefile b/emulators/linux_base-fc7/Makefile
index c0be58a9f4d5..05e228822016 100644
--- a/emulators/linux_base-fc7/Makefile
+++ b/emulators/linux_base-fc7/Makefile
@@ -98,9 +98,8 @@ CONFLICTS=		linux_base-7* linux_base-deb* linux_base-gentoo* \
 			linux_base-fc3 linux-libgcc* linux_locale*
 ONLY_FOR_ARCHS=		i386 amd64
 LINUX_RPM_ARCH=		i386
-PREFIX?=		${LINUXBASE}
+USE_LINUX_PREFIX=	yes
 NO_FILTER_SHLIBS=	yes
-NO_MTREE=		yes
 NO_WRKSUBDIR=		yes
 MD5_FILE?=		${MASTERDIR}/distinfo.${LINUX_RPM_ARCH}
 PLIST_SUB=		GLIBCVER="2.3.6"