diff options
| author | maho <maho@FreeBSD.org> | 2006-05-31 03:05:19 +0000 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2006-05-31 03:05:19 +0000 |
| commit | a6d6286361e41600ab67006bbb94013d7003da31 (patch) | |
| tree | dbc5653135ab9d3c6c1f29fabf6950cc6ce87e35 /editors/openoffice.org-3-RC | |
| parent | 5279dbbe0523b491b0f914348a845ab376f97ed1 (diff) | |
| download | FreeBSD-ports-a6d6286361e41600ab67006bbb94013d7003da31.zip FreeBSD-ports-a6d6286361e41600ab67006bbb94013d7003da31.tar.gz | |
MACHINE_ARCH fix.
Submitted by: FreshPorts Sanity Daemon <FreshPorts@FreshPorts.org>
Pointy hat to: myself
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index a66faf2..a4c2d53 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/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 |
