CVS commit: pkgsrc/lang/guile22

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

Module Name:    pkgsrc
Committed By:   jlam
Date:           Sat Aug 19 00:27:59 UTC 2017

Modified Files:
        pkgsrc/lang/guile22: Makefile

Log Message:
lang/guile22: Fix PLIST errors for non-default PKG{INFO,MAN}DIR.

If Guile installs into a non-default installation prefix, then
use ${GUILE_PREFIX}/info and ${GUILE_PREFIX}/man as the locations
for the installed GNU info files and manpages.  This avoids needing
to do a lot of fixes to the PLISTs.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/guile22/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/guile22/Makefile
diff -u pkgsrc/lang/guile22/Makefile:1.3 pkgsrc/lang/guile22/Makefile:1.4
--- pkgsrc/lang/guile22/Makefile:1.3    Thu Mar 16 23:39:05 2017
+++ pkgsrc/lang/guile22/Makefile        Sat Aug 19 00:27:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2017/03/16 23:39:05 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2017/08/19 00:27:59 jlam Exp $
 
 DISTNAME=      guile-2.2.0
 PKGNAME=       ${DISTNAME:S/guile/guile22/}
@@ -12,23 +12,29 @@ COMMENT=    Official extension language for
 LICENSE=       gnu-lgpl-v3
 
 # Currently, 2.0 is primary.
-GUILE_PREFIX=  ${PREFIX}/guile/2.2
-#GUILE_PREFIX= ${PREFIX}
+GUILE_SUBDIR=  guile/2.2
+#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.
+.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