diff options
author | Maho Nakata <maho@FreeBSD.org> | 2006-05-31 03:05:19 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2006-05-31 03:05:19 +0000 |
commit | 88f577aac67278750f8578c0fbea2c60de6ace40 (patch) | |
tree | 3ec11567812c9dbe71b1abe95543b98d474f90ca /editors/openoffice.org-2.0 | |
parent | f41130765387b7e4dfb45c2e2e0fd42ef193682d (diff) |
Notes
Diffstat (limited to 'editors/openoffice.org-2.0')
-rw-r--r-- | editors/openoffice.org-2.0/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editors/openoffice.org-2.0/Makefile b/editors/openoffice.org-2.0/Makefile index a66faf216632..a4c2d532646f 100644 --- a/editors/openoffice.org-2.0/Makefile +++ b/editors/openoffice.org-2.0/Makefile @@ -55,7 +55,7 @@ BROKEN= "Work in progress" USE_JAVA= yes JAVA_VERSION= 1.4+ JAVA_BUILD= jdk -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 JAVA_VENDOR= bsdjava .else JAVA_VENDOR= freebsd bsdjava @@ -65,11 +65,11 @@ JAVA_VENDOR= freebsd bsdjava .include <bsd.port.pre.mk> .include <${FILESDIR}/Makefile.localized> -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 GCC_TARGET= x86_64-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDAMDEnv.Set .else -GCC_TARGET= ${ARCH}-portbld-freebsd${OSREL} +GCC_TARGET= ${MACHINE_ARCH}-portbld-freebsd${OSREL} FREEBSD_ENV_SET= FreeBSDIntelEnv.Set .endif @@ -84,7 +84,7 @@ INSTALLATION_BASEDIR?= openoffice.org-${OOOVERSION} EXECBASE?= openoffice.org-${OOOVERSION} DIST_SUBDIR= openoffice.org2.0 SIMPLEOSVER= ${OSREL:C/\.//g} -.if ${ARCH} == amd64 +.if ${MACHINE_ARCH} == amd64 PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86_64 .else PACKAGE_BASENAME= OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel |