diff options
| author | uebayasi <uebayasi> | 2005-03-03 16:16:03 +0000 |
|---|---|---|
| committer | uebayasi <uebayasi> | 2005-03-03 16:16:03 +0000 |
| commit | 9e1a3f43eb08302fe8a4cbf03e802c39ef1e8f86 (patch) | |
| tree | 0b979a07cb853493c71709a07ae49297e26ea248 /editors/xemacs | |
| parent | 6171f853787ea3709d44223053a82f534d6c7262 (diff) | |
| download | pkgsrc-9e1a3f43eb08302fe8a4cbf03e802c39ef1e8f86.tar.gz | |
* Correct PLIST when !defined(PKG_OPTIONS.xemacs:Mcanna).
* Move library/header path configurations from xemacs/Makefile.common
to xemacs/Makefile and xemacs-nox11/Makefile. Don't add X-related
paths for -nox11. Fix build failure reported by bulk builds.
Diffstat (limited to 'editors/xemacs')
| -rw-r--r-- | editors/xemacs/Makefile | 6 | ||||
| -rw-r--r-- | editors/xemacs/Makefile.common | 5 | ||||
| -rw-r--r-- | editors/xemacs/PLIST | 4 | ||||
| -rw-r--r-- | editors/xemacs/options.mk | 4 |
4 files changed, 11 insertions, 8 deletions
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index c8f277ae61e..def43c2db72 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.75 2005/02/28 16:20:09 uebayasi Exp $ +# $NetBSD: Makefile,v 1.76 2005/03/03 16:16:03 uebayasi Exp $ .include "../../editors/xemacs/Makefile.common" @@ -6,6 +6,10 @@ MAINTAINER= uebayasi@NetBSD.org USE_X11= YES +CONFIGURE_ARGS+= --site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include +CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR} +CONFIGURE_ARGS+= --site-runtime-libraries=${LOCALBASE}/lib:${X11BASE}/lib + .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common index b01fe352b0c..bc135df3cf5 100644 --- a/editors/xemacs/Makefile.common +++ b/editors/xemacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2005/02/28 16:20:09 uebayasi Exp $ +# $NetBSD: Makefile.common,v 1.8 2005/03/03 16:16:03 uebayasi Exp $ DISTNAME= xemacs-21.4.17 CATEGORIES= editors @@ -92,9 +92,6 @@ CONFIGURE_ARGS+= --with-ncurses=no CONFIGURE_ARGS+= --with-msw=no CONFIGURE_ARGS+= ${WITH_DIALOGS} CONFIGURE_ARGS+= --infopath="${INFOPATH}" -CONFIGURE_ARGS+= --site-includes=${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include:${WRKDIR} -CONFIGURE_ARGS+= --site-libraries=${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR} -CONFIGURE_ARGS+= --site-runtime-libraries=${LOCALBASE}/lib:${X11BASE}/lib CFLAGS+= -Dunix diff --git a/editors/xemacs/PLIST b/editors/xemacs/PLIST index 6038ae46b34..7bb2e82c6a3 100644 --- a/editors/xemacs/PLIST +++ b/editors/xemacs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2005/02/28 16:20:09 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.11 2005/03/03 16:16:03 uebayasi Exp $ bin/${DISTNAME} bin/ellcc bin/gnuattach @@ -1057,7 +1057,7 @@ lib/${DISTNAME}/lisp/mule/arabic.elc lib/${DISTNAME}/lisp/mule/auto-autoloads.el${ELSUFX} lib/${DISTNAME}/lisp/mule/auto-autoloads.elc lib/${DISTNAME}/lisp/mule/canna-leim.el${ELSUFX} -lib/${DISTNAME}/lisp/mule/canna-leim.elc +${FOR_MULE}lib/${DISTNAME}/lisp/mule/canna-leim.elc lib/${DISTNAME}/lisp/mule/chinese.el${ELSUFX} lib/${DISTNAME}/lisp/mule/chinese.elc lib/${DISTNAME}/lisp/mule/custom-load.el${ELSUFX} diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk index 6b3e16c2587..f022b43eccb 100644 --- a/editors/xemacs/options.mk +++ b/editors/xemacs/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/02/28 16:20:10 uebayasi Exp $ +# $NetBSD: options.mk,v 1.4 2005/03/03 16:16:03 uebayasi Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS= ldap xface canna @@ -22,6 +22,8 @@ CONFIGURE_ARGS= --without-xface .if !empty(PKG_OPTIONS:Mcanna) . include "../../inputmethod/canna-lib/buildlink3.mk" CONFIGURE_ARGS= --with-canna +PLIST_SUBST+= FOR_MULE='' .else CONFIGURE_ARGS= --without-canna +PLIST_SUBST+= FOR_MULE='@comment ' .endif |