From d928b8f223d75ad5ec56496e1cd38fce23946ac2 Mon Sep 17 00:00:00 2001 From: jschauma Date: Wed, 26 Mar 2003 04:05:37 +0000 Subject: De-confusify: Let emulators/suse_*/Makefile.* _not_ include bsd.pkg.mk, but rather make all packages that use linux emulation include bsd.pkg.mk as the last files just like any normal package. --- emulators/suse_linux/Makefile.application | 7 ++----- emulators/suse_linux/Makefile.common | 4 +--- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'emulators/suse_linux') diff --git a/emulators/suse_linux/Makefile.application b/emulators/suse_linux/Makefile.application index d9164db447b..5e86244bee5 100644 --- a/emulators/suse_linux/Makefile.application +++ b/emulators/suse_linux/Makefile.application @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.application,v 1.5 2002/11/25 11:01:16 schmonz Exp $ +# $NetBSD: Makefile.application,v 1.6 2003/03/26 04:05:47 jschauma Exp $ .include "../../mk/bsd.prefs.mk" @@ -14,9 +14,7 @@ SUSE_VERSION= 7.3 .endif .if defined(RPMFILES) -.include "../../emulators/${SUSE_DIR_PREFIX}_linux/Makefile.common" -.else -.include "../../mk/bsd.pkg.mk" +. include "../../emulators/${SUSE_DIR_PREFIX}_linux/Makefile.common" .endif .else @@ -25,5 +23,4 @@ SUSE_VERSION= 7.3 # This speeds up the marking of all compat_linux packages # as not available. SUSE_DIR_PREFIX= suse -.include "../../mk/bsd.pkg.mk" .endif diff --git a/emulators/suse_linux/Makefile.common b/emulators/suse_linux/Makefile.common index 881047216fc..3672f92e22f 100644 --- a/emulators/suse_linux/Makefile.common +++ b/emulators/suse_linux/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.14 2002/12/09 15:17:09 tron Exp $ +# $NetBSD: Makefile.common,v 1.15 2003/03/26 04:05:47 jschauma Exp $ SUSE_VERSION= 7.3 @@ -56,5 +56,3 @@ do-install: show-shlib-type: @${ECHO} linux-${MACHINE_ARCH} - -.include "../../mk/bsd.pkg.mk" -- cgit v1.2.3