pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/openoffice-bin Add DISTNAME section for Linux/i38...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/15236d2eed36
branches:  trunk
changeset: 491975:15236d2eed36
user:      mrauch <mrauch%pkgsrc.org@localhost>
date:      Sat Apr 02 15:46:39 2005 +0000

description:
Add DISTNAME section for Linux/i386, which got lost.

diffstat:

 misc/openoffice-bin/Makefile |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r 4d7d62cdaa19 -r 15236d2eed36 misc/openoffice-bin/Makefile
--- a/misc/openoffice-bin/Makefile      Sat Apr 02 14:48:35 2005 +0000
+++ b/misc/openoffice-bin/Makefile      Sat Apr 02 15:46:39 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/16 18:33:41 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/04/02 15:46:39 mrauch Exp $
 
 PKGNAME=               openoffice-bin-${OO_VER}
 CATEGORIES=            misc
@@ -34,6 +34,9 @@
 .include "../../mk/bsd.prefs.mk"
 
 do-build:
+# group together i386, i486, i586 and i686 (for Linux)
+#
+ARCH=  ${MACHINE_ARCH:C/i[3-6]86/i386/g}
 
 .if ${OPSYS} == "NetBSD"
 USE_PKGINSTALL=         yes
@@ -50,6 +53,12 @@
 
 .endif
 
+.if ${OPSYS} == "Linux"
+.if ${ARCH} == "i386"
+DISTNAME=      OOo_${OO_VER}_LinuxIntel_install
+.endif
+.endif
+
 .if ${OPSYS} == "SunOS"
 .if ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64"
 DISTNAME=      OOo_${OO_VER}_SolarisSparc_install
@@ -86,9 +95,6 @@
 .endfor
 
 # everything specific to your OS/Arch goes into its own Makefile
-# group together i386, i486, i586 and i686 (for Linux)
-#
-ARCH=  ${MACHINE_ARCH:C/i[3-6]86/i386/g}
 
 .if exists(Makefile.${OPSYS}.${ARCH})
 .  include "Makefile.${OPSYS}.${ARCH}"



Home | Main Index | Thread Index | Old Index