diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-06-06 14:06:19 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-06-06 14:06:19 +0000 |
| commit | 693991c51e5b4aa4ccb682d41e6624dc2a8a0e7f (patch) | |
| tree | efd88ac0c97768711be63b75a1fc01ca5274dbb5 /editors | |
| parent | Remove /usr/local/lib from LD_LIBRARY_PATH. This should fix compile (diff) | |
Add DMAKE variable we can later use for more targets.
Notes
Notes:
svn path=/head/; revision=60698
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 14 | ||||
| -rw-r--r-- | editors/openoffice.org-1.0/Makefile | 14 | ||||
| -rw-r--r-- | editors/openoffice/Makefile | 14 |
3 files changed, 21 insertions, 21 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index c2fc4d02c4f3..7456ad0023eb 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -61,7 +61,12 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WRKSRC= ${WRKDIR}/oo_1.0_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 +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ +.if defined(WITH_DEBUG) +DMAKE= "dmake debug=true" +.else +DMAKE= "dmake strip=true" +.endif CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} @@ -201,13 +206,8 @@ post-patch: do-build: @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap -.if defined(WITH_DEBUG) @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && dmake debug=true' -.else - @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && dmake strip=true' -.endif + tcsh -c 'source FreeBSDEnv.Set && ${DMAKE}' pre-install: @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \ diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index c2fc4d02c4f3..7456ad0023eb 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -61,7 +61,12 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WRKSRC= ${WRKDIR}/oo_1.0_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 +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ +.if defined(WITH_DEBUG) +DMAKE= "dmake debug=true" +.else +DMAKE= "dmake strip=true" +.endif CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} @@ -201,13 +206,8 @@ post-patch: do-build: @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap -.if defined(WITH_DEBUG) @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && dmake debug=true' -.else - @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && dmake strip=true' -.endif + tcsh -c 'source FreeBSDEnv.Set && ${DMAKE}' pre-install: @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \ diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index c2fc4d02c4f3..7456ad0023eb 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -61,7 +61,12 @@ GNU_CONFIGURE= yes USE_AUTOCONF= yes WRKSRC= ${WRKDIR}/oo_1.0_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 +LD_PATH= ${LD_PATH1}:${WRKSRC}/../solver/641/unxfbsd.pro/lib/ +.if defined(WITH_DEBUG) +DMAKE= "dmake debug=true" +.else +DMAKE= "dmake strip=true" +.endif CONFIGURE_ENV= PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \ PTHREAD_LIBS=${PTHREAD_LIBS} @@ -201,13 +206,8 @@ post-patch: do-build: @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap -.if defined(WITH_DEBUG) @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && dmake debug=true' -.else - @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ - tcsh -c 'source FreeBSDEnv.Set && dmake strip=true' -.endif + tcsh -c 'source FreeBSDEnv.Set && ${DMAKE}' pre-install: @${SED} -e 's#%%PREFIX%%#${PREFIX}#g' < ${FILESDIR}/oo_setup.resp \ |