From ee206983980b231a3b8c2c827bc366efc9380ee1 Mon Sep 17 00:00:00 2001
From: robert <robert@openbsd.org>
Date: Thu, 15 Nov 2007 15:54:32 +0000
Subject: [PATCH] - remove the linkobj flavor and use the same method for the
 default build process - add a PSEUDO_FLAVOR named normal_build for doing a
 build w/o harlinking object files. this takes much more disk space

requested by espie@
---
 editors/openoffice/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile
index cb0c9568dc1..65816b56bd6 100644
--- a/editors/openoffice/Makefile
+++ b/editors/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.64 2007/11/14 20:10:49 robert Exp $
+# $OpenBSD: Makefile,v 1.65 2007/11/15 15:54:32 robert Exp $
 
 ONLY_FOR_ARCHS= amd64 i386
 
@@ -53,7 +53,7 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MULTI_PACKAGES=		-main -kde -java
 
-PSEUDO_FLAVORS=	linkobj no_lang
+PSEUDO_FLAVORS=	normal_build no_lang
 FLAVORS=	debug
 FLAVOR?=
 
@@ -169,11 +169,11 @@ MAKE_ENV+=	envcflags="${CFLAGS}"
 # kludge
 TCSH=		${LOCALBASE}/bin/tcsh
 
-.if ${FLAVOR:L:Mlinkobj}
+.if ${FLAVOR:L:Mnormal_build}
+BUILD_CMD=	dmake && cd instsetoo_native/util && dmake ooolanguagepack
+.else
 BUILD_CMD=	cd instsetoo_native && build.pl --all --dlv_switch -link && \
 		cd util && dmake ooolanguagepack
-.else
-BUILD_CMD=	dmake && cd instsetoo_native/util && dmake ooolanguagepack
 .endif
 
 pre-patch: