diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2007-08-13 16:13:38 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2007-08-13 16:13:38 +0000 |
| commit | 80f1ff8cc26620eff1b075d7ce77a5dee7850057 (patch) | |
| tree | b00758e9dccbf9185589ddc7934b17c15a6364c9 /editors/emacs.app | |
| parent | - Fix the build on -CURRENT with the recent wi_req struct changes. (diff) | |
- fix build for CURRENT
- separate configure, build and install
- work around Segmentation fault on pointyhat (i386 only)
Approved by: gurkan (maintainer)
Notes
Notes:
svn path=/head/; revision=197589
Diffstat (limited to 'editors/emacs.app')
| -rw-r--r-- | editors/emacs.app/Makefile | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/editors/emacs.app/Makefile b/editors/emacs.app/Makefile index f051b7928be9..f6e239f7ce93 100644 --- a/editors/emacs.app/Makefile +++ b/editors/emacs.app/Makefile @@ -17,23 +17,32 @@ MAINTAINER= gurkan@linuks.mine.nu COMMENT= The GNU Emacs editor on GNUstep USE_GNUSTEP= yes +USE_GNUSTEP_CONFIGURE= yes +USE_GNUSTEP_BUILD= yes +USE_GNUSTEP_INSTALL= yes USE_GNUSTEP_PREFIX= yes USE_GNUSTEP_BACK= yes USE_GNUSTEP_MAKE= yes WRKSRC= ${WRKDIR}/${DISTNAME} -BASEDIR=${WRKSRC}/build/Emacs.app -BINDIR=${BASEDIR} -CFLAGS+=-I${PREFIX}/System/Library/Headers/ +CPPFLAGS+= -I${PREFIX}/System/Library/Headers/ +CONFIGURE_ENV+= CC=${CC} CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" MAKE="${GMAKE}" +BASEDIR= ${WRKSRC}/nextstep/build/Emacs.app +CONFIGURE_ARGS+= --without-gcc --with-ns --without-x --with-pop \ + --prefix=${BASEDIR}/Resources --exec-prefix=${BASEDIR} --libexecdir=${BASEDIR}/libexec \ + ${CONFIGURE_TARGET} +USE_MAKEFILE= yes +MAKE_ENV+= MAKE="${GMAKE}" EMACSLOADPATH="${WRKSRC}/lisp:${WRKSRC}/leim" post-configure: @${REINPLACE_CMD} -e 's|#define config_machfile "m/.h"|#define config_machfile "m/sparc.h"|g' ${WRKSRC}/src/config.h - @${REINPLACE_CMD} -e's|source /etc/GNUstep/GNUstep.conf|. ${GNUSTEP_MAKEFILES}/GNUstep.sh|g' ${WRKSRC}/nextstep/compile -do-build: - (. ${GNUSTEP_MAKEFILES}/GNUstep.sh; cd ${WRKSRC}/nextstep; ${MAKE_ENV} ./compile) - -do-install: +post-install: + cd ${BASEDIR}/Resources && ${MV} -f share/emacs/*/* . + cd ${BASEDIR}/Resources && ${RM} -fr share + cd ${BASEDIR}/bin && ${RM} -f emacs emacs-23* + cd ${BASEDIR}/libexec && ${MV} -f emacs/*/*/* . + cd ${BASEDIR}/libexec && ${RM} -fr emacs ${CP} -r ${WRKSRC}/nextstep/build/Emacs.app ${PREFIX}/System/Applications/ .if defined(PACKAGE_BUILDING) || defined(BATCH) || defined(CLEAN_ROOT) ${RM} -rf /root/GNUstep |