diff options
| author | jlam <jlam> | 2003-01-24 04:22:42 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-01-24 04:22:42 +0000 |
| commit | e697c7590f64dfcaa395dda4cc956af3108cc2bf (patch) | |
| tree | 1bdcfd161710e81248e5744d1cd6334c6e71f314 /devel/g-wrap | |
| parent | 6c18bfa134b13c2849de80ce2a7eeb41a4fa442a (diff) | |
| download | pkgsrc-e697c7590f64dfcaa395dda4cc956af3108cc2bf.tar.gz | |
Fix the installed g-wrap-config to invoke ${GUILE14_PREFIX}/bin/guile
instead of the one in the work directory. Also ensure that we install
guile library files into ${GUILE14_PREFIX}/share/guile instead of into
the same place under ${LOCALBASE}, since we are using guile14. Bump
PKGREVISION of devel/g-wrap to 1.
Diffstat (limited to 'devel/g-wrap')
| -rw-r--r-- | devel/g-wrap/Makefile | 6 | ||||
| -rw-r--r-- | devel/g-wrap/PLIST | 28 | ||||
| -rw-r--r-- | devel/g-wrap/buildlink2.mk | 5 |
3 files changed, 21 insertions, 18 deletions
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile index 48b96710b99..c107ca0ede4 100644 --- a/devel/g-wrap/Makefile +++ b/devel/g-wrap/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2003/01/19 04:43:38 uebayasi Exp $ +# $NetBSD: Makefile,v 1.14 2003/01/24 04:22:42 jlam Exp $ DISTNAME= g-wrap-1.2.1 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=g-wrap/} @@ -14,6 +15,9 @@ USE_BUILDLINK2= YES USE_GMAKE= YES GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --with-modules-dir=${GUILE14_PREFIX}/share/guile +CONFIGURE_ENV+= GUILE=${GUILE14} +CONFIGURE_ENV+= BUILD_GUILE=${GUILE14_CONFIG} CONFIGURE_ENV+= ac_cv_path_RSCHEME="nope" USE_LIBTOOL= YES diff --git a/devel/g-wrap/PLIST b/devel/g-wrap/PLIST index b90e459d519..4df4f0d569d 100644 --- a/devel/g-wrap/PLIST +++ b/devel/g-wrap/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/08/21 00:21:56 mjl Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/01/24 04:22:42 jlam Exp $ bin/g-wrap-config include/g-wrap-runtime-guile.h info/g-wrap.info @@ -10,16 +10,16 @@ lib/libg-wrap-runtime-guile.so lib/libg-wrap-runtime-guile.so.2 lib/libg-wrap-runtime-guile.so.2.0 share/aclocal/g-wrap.m4 -share/guile/g-wrap.scm -share/guile/g-wrap/g-translate.scm -share/guile/g-wrap/guile-types.scm -share/guile/g-wrap/output-file.scm -share/guile/g-wrap/sorting.scm -share/guile/g-wrapped/gw-runtime-spec.scm -share/guile/g-wrapped/libgw-runtime.a -share/guile/g-wrapped/libgw-runtime.la -share/guile/g-wrapped/libgw-runtime.so -share/guile/g-wrapped/libgw-runtime.so.0 -share/guile/g-wrapped/libgw-runtime.so.0.0 -@dirrm share/guile/g-wrapped -@dirrm share/guile/g-wrap +guile/1.4/share/guile/g-wrap.scm +guile/1.4/share/guile/g-wrap/g-translate.scm +guile/1.4/share/guile/g-wrap/guile-types.scm +guile/1.4/share/guile/g-wrap/output-file.scm +guile/1.4/share/guile/g-wrap/sorting.scm +guile/1.4/share/guile/g-wrapped/gw-runtime-spec.scm +guile/1.4/share/guile/g-wrapped/libgw-runtime.a +guile/1.4/share/guile/g-wrapped/libgw-runtime.la +guile/1.4/share/guile/g-wrapped/libgw-runtime.so +guile/1.4/share/guile/g-wrapped/libgw-runtime.so.0 +guile/1.4/share/guile/g-wrapped/libgw-runtime.so.0.0 +@dirrm guile/1.4/share/guile/g-wrapped +@dirrm guile/1.4/share/guile/g-wrap diff --git a/devel/g-wrap/buildlink2.mk b/devel/g-wrap/buildlink2.mk index 9c8213bd908..f6b9e9166fb 100644 --- a/devel/g-wrap/buildlink2.mk +++ b/devel/g-wrap/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.3 2003/01/19 04:43:38 uebayasi Exp $ +# $NetBSD: buildlink2.mk,v 1.4 2003/01/24 04:22:42 jlam Exp $ .if !defined(G_WRAP_BUILDLINK2_MK) G_WRAP_BUILDLINK2_MK= # defined @@ -9,8 +9,7 @@ BUILDLINK_PKGSRCDIR.g-wrap?= ../../devel/g-wrap EVAL_PREFIX+= BUILDLINK_PREFIX.g-wrap=g-wrap BUILDLINK_PREFIX.g-wrap_DEFAULT= ${LOCALBASE} -BUILDLINK_FILES.g-wrap+= bin/g-wrap-config -BUILDLINK_FILES.g-wrap+= include/g-wrap-runtime-guile.h +BUILDLINK_FILES.g-wrap= include/g-wrap-runtime-guile.h BUILDLINK_FILES.g-wrap+= lib/libg-wrap-runtime-guile.* .include "../../lang/guile14/buildlink2.mk" |