diff options
| author | jlam <jlam@pkgsrc.org> | 2002-04-09 18:28:43 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-04-09 18:28:43 +0000 |
| commit | 7d0a32cc4575777a681d04b2acf709b161dc0445 (patch) | |
| tree | 4f4919c4d0f3d829c606ccc71f661dfee6c6f6d5 /devel/GConf | |
| parent | d0399ba78c5153ef6fe0feb9b925ef46ef5b6d65 (diff) | |
| download | pkgsrc-7d0a32cc4575777a681d04b2acf709b161dc0445.tar.gz | |
* Remove unnecessary dependency on guile. The guile wrappers are currently
_never_ built, regardless of whether guile is detected or not.
* Strongly buildlinkify.
* Use LIBTOOL_OVERRIDE instead of LTCONFIG_OVERRIDE so that the correct
libtool is used during the build and installation.
* Add a pre-build target to symlink the libxml headers into ${WRKSRC} so
that references to <libxml/foo.h> will resolve to <gnome-xml/foo.h>. I
imagine that the sources will be fixed to refer to more recent header
locations in a future release of GConf.
Diffstat (limited to 'devel/GConf')
| -rw-r--r-- | devel/GConf/Makefile | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile index c92873378aa..63a08aff496 100644 --- a/devel/GConf/Makefile +++ b/devel/GConf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2002/03/20 12:36:44 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2002/04/09 18:28:43 jlam Exp $ # DISTNAME= GConf-1.0.9 @@ -11,16 +11,21 @@ HOMEPAGE= http://advogato.org/proj/GConf/ COMMENT= configuration database system used by GNOME BUILD_USES_MSGFMT= yes -DEPENDS+= guile>=1.3.4:../../lang/guile +#DEPENDS+= guile>=1.3.4:../../lang/guile +USE_BUILDLINK_ONLY= YES GNU_CONFIGURE= YES USE_X11BASE= YES USE_LIBTOOL= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -CPPFLAGS+= -I${LOCALBASE}/include/db3 -I${X11PREFIX}/include +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +CPPFLAGS+= -I${BUILDLINK_DIR}/include/db3 PLIST_SUBST+= LOCALBASE=${LOCALBASE} +pre-build: + ${RM} -f ${WRKSRC}/gconf/libxml + ${LN} -sf ${BUILDLINK_DIR}/include/gnome-xml ${WRKSRC}/gconf/libxml + post-install: ${TEST} ${PREFIX} = ${LOCALBASE} || \ ${LN} -fs ${PREFIX}/share/aclocal/gconf-1.m4 \ @@ -31,7 +36,7 @@ post-install: .include "../../devel/gettext-lib/buildlink.mk" .include "../../databases/db3/buildlink.mk" -.include "../../devel/popt/buildlink.mk" .include "../../devel/oaf/buildlink.mk" +.include "../../devel/popt/buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |