diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-08-25 21:14:00 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-08-25 21:14:00 +0000 |
| commit | fa61be99d5dbc05539fcbe5ad6271d5d89cb9e3a (patch) | |
| tree | 1c96c4162dba45e4e6368aea65d3ff0d7ce85f58 /editors | |
| parent | 240008552df3ff2ae6d3870af79f14986146b83d (diff) | |
Notes
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 15 | ||||
| -rw-r--r-- | editors/openoffice.org-1.0/Makefile | 15 | ||||
| -rw-r--r-- | editors/openoffice/Makefile | 15 |
3 files changed, 24 insertions, 21 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index 3675db769315..acb0ee2fea70 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -112,18 +112,19 @@ JAVAVM= ${JDK13DIR}/bin/java GNU_CONFIGURE= yes USE_AUTOCONF= yes -WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office +WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work +WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 -DMAKE= dmake debug="true" +BUILD= build debug="true" .else -DMAKE= dmake +BUILD= build .endif .else -DMAKE= dmake strip="true" +BUILD= build strip="true" .endif .if !defined(DISPLAY) @@ -389,16 +390,16 @@ do-build: .endif .if !defined(DISPLAY) @cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${DMAKE}' + tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}' @${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else @cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${DMAKE}' + tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}' .endif .if defined(LANG_PKGNAME) @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${DMAKE} LANGEXT=${LANGEXT}' + tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANGEXT}' .endif pre-install: diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index 3675db769315..acb0ee2fea70 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -112,18 +112,19 @@ JAVAVM= ${JDK13DIR}/bin/java GNU_CONFIGURE= yes USE_AUTOCONF= yes -WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office +WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work +WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 -DMAKE= dmake debug="true" +BUILD= build debug="true" .else -DMAKE= dmake +BUILD= build .endif .else -DMAKE= dmake strip="true" +BUILD= build strip="true" .endif .if !defined(DISPLAY) @@ -389,16 +390,16 @@ do-build: .endif .if !defined(DISPLAY) @cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${DMAKE}' + tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}' @${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else @cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${DMAKE}' + tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}' .endif .if defined(LANG_PKGNAME) @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${DMAKE} LANGEXT=${LANGEXT}' + tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANGEXT}' .endif pre-install: diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index 3675db769315..acb0ee2fea70 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -112,18 +112,19 @@ JAVAVM= ${JDK13DIR}/bin/java GNU_CONFIGURE= yes USE_AUTOCONF= yes -WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office +WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work +WRKSRC= ${WRKDIR}/oo_1.0.1_src/config_office LD_PATH1= ${WRKSRC}/../vos/unxfbsd.pro/lib/:${WRKSRC}/../ucbhelper/unxfbsd.pro/lib/ LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ .if defined(WITH_DEBUG) CFLAGS+= -g .if ${WITH_DEBUG} == 2 -DMAKE= dmake debug="true" +BUILD= build debug="true" .else -DMAKE= dmake +BUILD= build .endif .else -DMAKE= dmake strip="true" +BUILD= build strip="true" .endif .if !defined(DISPLAY) @@ -389,16 +390,16 @@ do-build: .endif .if !defined(DISPLAY) @cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${DMAKE}' + tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}' @${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else @cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${DMAKE}' + tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}' .endif .if defined(LANG_PKGNAME) @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${DMAKE} LANGEXT=${LANGEXT}' + tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && cd instsetoo/util && ${BUILD} LANGEXT=${LANGEXT}' .endif pre-install: |