summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorjschauma <jschauma@pkgsrc.org>2003-03-26 04:05:37 +0000
committerjschauma <jschauma@pkgsrc.org>2003-03-26 04:05:37 +0000
commitd928b8f223d75ad5ec56496e1cd38fce23946ac2 (patch)
tree6f043964c16f075744798d96906ffc87f3f46c76 /misc
parent96f8b433320466230a5bb4610b884a85ca2d9910 (diff)
downloadpkgsrc-d928b8f223d75ad5ec56496e1cd38fce23946ac2.tar.gz
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.
Diffstat (limited to 'misc')
-rw-r--r--misc/openoffice-linux/Makefile6
-rw-r--r--misc/staroffice/Makefile3
2 files changed, 5 insertions, 4 deletions
diff --git a/misc/openoffice-linux/Makefile b/misc/openoffice-linux/Makefile
index 7af8c0a80fa..42d03f988dc 100644
--- a/misc/openoffice-linux/Makefile
+++ b/misc/openoffice-linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/02/27 23:26:11 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/26 04:05:42 jschauma Exp $
DISTNAME= OOo_1.0.2_LinuxIntel_install
PKGNAME= openoffice-linux-1.0.2
@@ -72,6 +72,6 @@ ARCH= ${MACHINE_ARCH:C/i[3-6]86/i386/g}
.if exists(Makefile.${OPSYS}.${ARCH})
. include "Makefile.${OPSYS}.${ARCH}"
-.else
-. include "../../mk/bsd.pkg.mk"
.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/misc/staroffice/Makefile b/misc/staroffice/Makefile
index 9a2c8b754c6..bad9f2308f9 100644
--- a/misc/staroffice/Makefile
+++ b/misc/staroffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/07/03 16:32:49 agc Exp $
+# $NetBSD: Makefile,v 1.26 2003/03/26 04:05:42 jschauma Exp $
DISTNAME= so51a_lnx_${LANGNO}
PKGNAME= staroffice-${LANGUAGE}-5.1a
@@ -146,3 +146,4 @@ post-install:
.endfor
.include "../../emulators/suse_linux/Makefile.application"
+.include "../../mk/bsd.pkg.mk"