CVS commit: pkgsrc/lang/guile20

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Sat Aug 19 00:28:10 UTC 2017

Modified Files:
        pkgsrc/lang/guile20: Makefile

Log Message:
lang/guile20: Mirror changes to lang/guile22/Makefile.

These changes aren't necessary, but on the day when guile-2.0.x is
no longer the primary, then the switch to using a non-default
installation prefix should be seamless.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/guile20/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/guile20/Makefile
diff -u pkgsrc/lang/guile20/Makefile:1.13 pkgsrc/lang/guile20/Makefile:1.14
--- pkgsrc/lang/guile20/Makefile:1.13   Wed May 17 12:06:20 2017
+++ pkgsrc/lang/guile20/Makefile        Sat Aug 19 00:28:10 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2017/05/17 12:06:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2017/08/19 00:28:10 jlam Exp $
 
 DISTNAME=      guile-2.0.14
 PKGNAME=       ${DISTNAME:S/guile/guile20/}
@@ -12,23 +12,29 @@ COMMENT=    Official extension language for
 LICENSE=       gnu-lgpl-v3
 
 # Currently, 2.0 is primary.
-#GUILE_PREFIX= ${PREFIX}/guile/2.0
-GUILE_PREFIX=  ${PREFIX}
+#GUILE_SUBDIR= guile/2.0
+GUILE_SUBDIR=  # empty
 
 # guile does not like the --build and --host triplets on NetBSD
 HAS_CONFIGURE= yes
 CONFIGURE_ARGS+=       --disable-shared
 # not until boehm-gc is threaded
 CONFIGURE_ARGS+=       --without-threads
-CONFIGURE_ARGS+=       --prefix=${GUILE_PREFIX}
-CONFIGURE_ARGS+=       --mandir=${GUILE_PREFIX}/${PKGMANDIR}
-CONFIGURE_ARGS+=       --infodir=${GUILE_PREFIX}/${PKGINFODIR}
-
 CONFIGURE_ARGS+=       SHELL=${CONFIG_SHELL}
 
-# When GUILE_PREFIX is non-default, these must be enabled.
-#BUILDLINK_PASSTHRU_DIRS+=     ${GUILE_PREFIX}
-#LDFLAGS+=                     ${COMPILER_RPATH_FLAG}${GUILE_PREFIX}/lib
+.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
+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}
+.endif
 
 INFO_FILES=    yes
 USE_LIBTOOL=   yes