diff options
| author | joerg <joerg@pkgsrc.org> | 2009-11-09 14:09:41 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-11-09 14:09:41 +0000 |
| commit | 19e5a70fb600de4c3bb82a39d916985d1fd5e566 (patch) | |
| tree | b4ab5fb31ce55408feb9cd4679193e634f5581f2 /editors | |
| parent | beb4acb98098f0e488e7d2f2e19f07bb259f4e71 (diff) | |
| download | pkgsrc-19e5a70fb600de4c3bb82a39d916985d1fd5e566.tar.gz | |
Don't leak the buildlink directories into the final program. I can't
find a good reason why they are used here, so don't use them.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/xemacs/options.mk | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk index 951221c2e05..af3e49ae416 100644 --- a/editors/xemacs/options.mk +++ b/editors/xemacs/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.8 2008/04/24 15:32:15 jlam Exp $ +# $NetBSD: options.mk,v 1.9 2009/11/09 14:09:41 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs PKG_SUPPORTED_OPTIONS= ldap xface canna x11 @@ -74,30 +74,18 @@ CONFIGURE_ARGS+= --with-jpeg CONFIGURE_ARGS+= --with-png CONFIGURE_ARGS+= --with-tiff CONFIGURE_ARGS+= --with-xpm -CONFIGURE_ARGS+= --site-includes=${SITE_INCLUDES:Q} -CONFIGURE_ARGS+= --site-libraries=${SITE_LIBRARIES:Q} -CONFIGURE_ARGS+= --site-runtime-libraries=${SITE_RUNTIME_LIBRARIES:Q} -. if ${X11_TYPE} != "modular" -SITE_INCLUDES= ${BUILDLINK_DIR}/include:${BUILDLINK_X11_DIR}/include -SITE_LIBRARIES= ${BUILDLINK_DIR}/lib:${BUILDLINK_X11_DIR}/lib -SITE_RUNTIME_LIBRARIES= ${PREFIX}/lib:${X11BASE}/lib -. else -SITE_INCLUDES= ${BUILDLINK_DIR}/include -SITE_LIBRARIES= ${BUILDLINK_DIR}/lib -SITE_RUNTIME_LIBRARIES= ${PREFIX}/lib -. endif +CONFIGURE_ARGS+= --site-includes=${PREFIX}/include:${X11BASE}/include +CONFIGURE_ARGS+= --site-libraries=${PREFIX}/lib:${X11BASE}/lib +CONFIGURE_ARGS+= --site-runtime-libraries=${PREFIX}/lib:${X11BASE}/lib .else CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --without-jpeg CONFIGURE_ARGS+= --without-png CONFIGURE_ARGS+= --without-tiff CONFIGURE_ARGS+= --without-xpm -CONFIGURE_ARGS+= --site-includes=${SITE_INCLUDES:Q} -CONFIGURE_ARGS+= --site-libraries=${SITE_LIBRARIES:Q} -CONFIGURE_ARGS+= --site-runtime-libraries=${SITE_RUNTIME_LIBRARIES:Q} -SITE_INCLUDES= ${BUILDLINK_DIR}/include -SITE_LIBRARIES= ${BUILDLINK_DIR}/lib -SITE_RUNTIME_LIBRARIES= ${PREFIX}/lib +CONFIGURE_ARGS+= --site-includes=${PREFIX}/include +CONFIGURE_ARGS+= --site-libraries=${PREFIX}/lib +CONFIGURE_ARGS+= --site-runtime-libraries=${PREFIX}/lib .endif ### |