diff options
| author | mrauch <mrauch> | 2005-04-02 15:46:39 +0000 |
|---|---|---|
| committer | mrauch <mrauch> | 2005-04-02 15:46:39 +0000 |
| commit | f9bd11d2dc684ed38116095b5cb2c7c15845970a (patch) | |
| tree | c680b6762e9dfe42c455ba0f08dfc3e61cf91b90 /misc | |
| parent | 0f51a431d60f871ecaa9893d67e53eb461e276be (diff) | |
| download | pkgsrc-f9bd11d2dc684ed38116095b5cb2c7c15845970a.tar.gz | |
Add DISTNAME section for Linux/i386, which got lost.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/openoffice-bin/Makefile | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/misc/openoffice-bin/Makefile b/misc/openoffice-bin/Makefile index f48cb4404c2..2b1b081f1a3 100644 --- a/misc/openoffice-bin/Makefile +++ b/misc/openoffice-bin/Makefile @@ -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 @@ CHECK_SHLIBS= no .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 @@ DISTNAME= OOo_${OO_VER}_LinuxIntel_install .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 @@ do-install: .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}" |