diff options
author | Erwin Lansing <erwin@FreeBSD.org> | 2004-10-14 08:47:14 +0000 |
---|---|---|
committer | Erwin Lansing <erwin@FreeBSD.org> | 2004-10-14 08:47:14 +0000 |
commit | 362d1f7c4e20bba777588dd0f98ef74ed13dcc54 (patch) | |
tree | 5eb3e957f443bacaf74cd63841d51270a5f3a517 /editors | |
parent | - Respect CC, CFLAGS (diff) |
Restore a piece of the previous commit that does some magic around
PKGNAMEPREFIX. I'm not sure about the implications for the build of
OOo, but at least it fixes INDEX builds.
Notes
Notes:
svn path=/head/; revision=119384
Diffstat (limited to 'editors')
-rw-r--r-- | editors/openoffice-1.1/Makefile | 6 | ||||
-rw-r--r-- | editors/openoffice.org-1.1/Makefile | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/editors/openoffice-1.1/Makefile b/editors/openoffice-1.1/Makefile index c8b9e47c816b..60935c0e9cb9 100644 --- a/editors/openoffice-1.1/Makefile +++ b/editors/openoffice-1.1/Makefile @@ -74,6 +74,12 @@ RELEASE_NR= ${PORTVERSION} INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} DIST_SUBDIR= openoffice1.1 SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//' +.if defined(LANG_PKGNAME) +PKGNAMEPREFIX= ${LANG_PKGNAME}- +.endif +.if defined(LANG_SUFFIX) +PKGNAMESUFFIX?= -${LANG_SUFFIX} +.endif BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 # FIXME diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index c8b9e47c816b..60935c0e9cb9 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -74,6 +74,12 @@ RELEASE_NR= ${PORTVERSION} INSTALLATION_BASEDIR= OpenOffice.org${RELEASE_NR} DIST_SUBDIR= openoffice1.1 SIMPLEOSVER!= ${UNAME} -r | ${SED} -e 's/\.//g' | ${SED} -e 's/-.*//' +.if defined(LANG_PKGNAME) +PKGNAMEPREFIX= ${LANG_PKGNAME}- +.endif +.if defined(LANG_SUFFIX) +PKGNAMESUFFIX?= -${LANG_SUFFIX} +.endif BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 # FIXME |