diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-09-14 07:20:09 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-09-14 07:20:09 +0000 |
| commit | 535c928b97fb2816d4719b3f5fbd6ca754dff21b (patch) | |
| tree | b1e64ba06f3f9fa25cd5477c9a4a13f52bce1d1c /editors/openoffice-1.0/Makefile | |
| parent | * Upgrade to 1.0.3 (diff) | |
Make a build work even if it has been aborted and the Virtual X-Server
has exited too. Add a new mozilla-install target, which installs the
packages to the place they belong.
Notes
Notes:
svn path=/head/; revision=66293
Diffstat (limited to 'editors/openoffice-1.0/Makefile')
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index f38885fea4c3..79bd67df6ac6 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -289,7 +289,7 @@ post-extract: @${CP} ${WRKDIR}/gpc231/gpc.c ${WRKSRC}/../external/gpc/ @${CP} ${WRKDIR}/gpc231/gpc.h ${WRKSRC}/../external/gpc/ @${MAKE} extract-mozilla WRKDIRPREFIX="" - @${RM} ${WRKSRC}/../moz/zipped/*.zip + @-${RM} ${WRKSRC}/../moz/zipped/*.zip .if defined(L10NHELP) @${ECHO_MSG} "===> Extracting L10NHELP sub project" @${MKDIR} ${WRKDIR}/L10NHELP @@ -377,6 +377,10 @@ build-mozilla: @${CP} ${FILESDIR}/zipmoz.sh ${WRKDIR} @${CHMOD} 755 ${WRKDIR}/zipmoz.sh @${WRKDIR}/zipmoz.sh ${WRKDIR}/mozilla/work/mozilla/dist FREEBSDGCCI ${WRKDIR} +.endif + +install-mozilla: +.if ! exists(${WRKDIR}/../moz/zipped/FREEBSDGCCIinc.zip) @${CP} ${WRKDIR}/FREEBSDGCCIinc.zip ${WRKSRC}/../moz/zipped/ @${CP} ${WRKDIR}/FREEBSDGCCIlib.zip ${WRKSRC}/../moz/zipped/ @${CP} ${WRKDIR}/FREEBSDGCCIruntime.zip ${WRKSRC}/../moz/zipped/ @@ -386,11 +390,12 @@ mozilla: @${MAKE} extract-mozilla @${MAKE} patch-mozilla @${MAKE} build-mozilla + @${MAKE} install-mozilla do-build: @${MAKE} mozilla .if exists(${WRKDIR}/.Xvfb.pid) - @${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill + @-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill @${RM} -f ${WRKDIR}/.Xvfb.pid .endif .if !defined(DISPLAY) @@ -403,12 +408,12 @@ do-build: @cd ${WRKSRC}/.. && PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" ./bootstrap .if defined(L10NHELP) @${MKDIR} ${WRKSRC}/../solver/641/unxfbsd.pro/pck - @${MV} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/641/unxfbsd.pro/pck + @${CP} ${WRKDIR}/L10NHELP/*.zip ${WRKSRC}/../solver/641/unxfbsd.pro/pck .endif .if !defined(DISPLAY) @cd ${WRKSRC}/.. && DISPLAY=${DISPLAYHACK} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ tcsh -c 'source FreeBSDEnv.Set && unsetenv TOP && ${BUILD}' - @${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill + @-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else @cd ${WRKSRC}/.. && DISPLAY=${DISPLAY} PATH="${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin" && \ @@ -433,7 +438,7 @@ do-install: @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \ TEMP=${WRKDIR} DISPLAY=${DISPLAYHACK} \ ${WRKSRC}/../instsetoo/*.pro/${LANG_EXT}/normal/setup -r:oo_setup.resp - @${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill + @-${CAT} ${WRKDIR}/.Xvfb.pid | xargs kill @${RM} -f ${WRKDIR}/.Xvfb.pid .else @-SAL_IGNOREXERRORS=1 PATH="/bin:${PATH}" LD_LIBRARY_PATH=${LD_PATH} \ |