diff options
| author | rillig <rillig@pkgsrc.org> | 2019-07-14 21:46:22 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2019-07-14 21:46:22 +0000 |
| commit | 6e1c995bb7f02fe07a58017bc29132db038fa9c0 (patch) | |
| tree | 352cd74361e0a7e8c2cdfe7a461efcbbffc855f5 /lang/guile22 | |
| parent | c01d7dcb643e4bdaf33f2673c52f2c073612f33c (diff) | |
| download | pkgsrc-6e1c995bb7f02fe07a58017bc29132db038fa9c0.tar.gz | |
lang/guile: fix alignment of variables
Diffstat (limited to 'lang/guile22')
| -rw-r--r-- | lang/guile22/Makefile | 18 | ||||
| -rw-r--r-- | lang/guile22/buildlink3.mk | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lang/guile22/Makefile b/lang/guile22/Makefile index c1af4caa3c4..273a4252c1f 100644 --- a/lang/guile22/Makefile +++ b/lang/guile22/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2019/06/23 09:14:58 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2019/07/14 21:46:22 rillig Exp $ DISTNAME= guile-2.2.5 PKGNAME= ${DISTNAME:S/guile/guile22/} @@ -15,7 +15,7 @@ GUILE_SUBDIR= guile/2.2 #GUILE_SUBDIR= # empty # guile does not like the --build and --host triplets on NetBSD -HAS_CONFIGURE= yes +HAS_CONFIGURE= yes CONFIGURE_ARGS+= --disable-shared # not until boehm-gc is threaded CONFIGURE_ARGS+= --without-threads @@ -23,16 +23,16 @@ CONFIGURE_ARGS+= SHELL=${CONFIG_SHELL} .if !empty(GUILE_SUBDIR) # Installation prefix is non-default. -GUILE_PREFIX= ${PREFIX}/${GUILE_SUBDIR} -CONFIGURE_ARGS+= --prefix=${GUILE_PREFIX:Q} -CONFIGURE_ARGS+= --infodir=${GUILE_PREFIX:Q}/info -CONFIGURE_ARGS+= --mandir=${GUILE_PREFIX:Q}/man +GUILE_PREFIX= ${PREFIX}/${GUILE_SUBDIR} +CONFIGURE_ARGS+= --prefix=${GUILE_PREFIX:Q} +CONFIGURE_ARGS+= --infodir=${GUILE_PREFIX:Q}/info +CONFIGURE_ARGS+= --mandir=${GUILE_PREFIX:Q}/man BUILDLINK_PASSTHRU_DIRS+= ${GUILE_PREFIX} LDFLAGS+= ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib .else -CONFIGURE_ARGS+= --prefix=${PREFIX:Q} -CONFIGURE_ARGS+= --infodir=${PREFIX:Q}/${PKGINFODIR:Q} -CONFIGURE_ARGS+= --mandir=${PREFIX:Q}/${PKGMANDIR:Q} +CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --infodir=${PREFIX}/${PKGINFODIR} +CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} .endif INFO_FILES= yes diff --git a/lang/guile22/buildlink3.mk b/lang/guile22/buildlink3.mk index aff708c817a..737bb490266 100644 --- a/lang/guile22/buildlink3.mk +++ b/lang/guile22/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2017/03/16 10:02:57 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2019/07/14 21:46:22 rillig Exp $ BUILDLINK_TREE+= guile22 @@ -8,7 +8,7 @@ GUILE22_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.guile22+= guile22>=2.2 BUILDLINK_PKGSRCDIR.guile22?= ../../lang/guile22 -BUILDLINK_PASSTHRU_DIRS= ${LOCALBASE}/guile/2.2 +BUILDLINK_PASSTHRU_DIRS= ${PREFIX}/guile/2.2 BUILDLINK_FILES.guile22+= guile/2.2/bin/* BUILDLINK_FNAME_TRANSFORM.guile22+= -e s,guile/2.2/bin,bin, BUILDLINK_FNAME_TRANSFORM.guile22+= -e s,guile/2.2/lib/pkgconfig,lib/pkgconfig, |