[pkgsrc/trunk]: pkgsrc/lang/scm Honor PKGINFODIR and PKGMANDIR and set the co...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/40a257adeaaf
branches:  trunk
changeset: 510829:40a257adeaaf
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Apr 04 20:47:21 2006 +0000

description:
Honor PKGINFODIR and PKGMANDIR and set the correct location of the slib
*.scm files.  Also properly separate out the configure step into its
own target.

diffstat:

 lang/scm/Makefile          |  32 +++++++++++++++++++-------------
 lang/scm/files/require.scm |   2 +-
 2 files changed, 20 insertions(+), 14 deletions(-)

diffs (65 lines):

diff -r 1824d2eb3271 -r 40a257adeaaf lang/scm/Makefile
--- a/lang/scm/Makefile Tue Apr 04 20:16:58 2006 +0000
+++ b/lang/scm/Makefile Tue Apr 04 20:47:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:56 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/04/04 20:47:21 jlam Exp $
 #
 # Convert the version number as follows 2d2 -> 2.4.2, where the d is
 # changed to a 4, representing the 4th letter.
@@ -22,30 +22,36 @@
 USE_TOOLS+=    gmake
 
 WRKSRC=                ${WRKDIR}/scm
+EVAL_PREFIX+=  SLIB_PREFIX=slib
 
 BUILD_TARGET=  scmlit libscm.a
 INSTALL_TARGET=        install installlib
 
+INSTALL_MAKE_FLAGS=    ${MAKE_FLAGS} mandir=${PREFIX:Q}/${PKGMANDIR:Q}/
+
 INFO_FILES=    scm.info hobbit.info Xlibscm.info
 
-post-patch:
-       ${SED} -e 's|@LOCALBASE@|${LOCALBASE}|g' \
-               < ${FILESDIR}/require.scm > ${WRKSRC}/require.scm
+INSTALLATION_DIRS=     ${PKGINFODIR} share/scm
+
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/x11.buildlink3.mk"
+
+do-configure:
+       ${SED} -e "s|@SLIB_PREFIX@|"${SLIB_PREFIX:Q}"|g"                \
+               ${FILESDIR}/require.scm > ${WRKSRC}/require.scm
+       ${SED}  -e "s|@CC@|"${CC:Q}"|g"                                 \
+               -e "s|@CFLAGS@|"${CFLAGS:Q}"|g"                         \
+               -e "s|@PREFIX@|"${PREFIX:Q}"|g"                         \
+               ${FILESDIR}/buildscm.sh > ${WRKSRC}/buildscm.sh         
 
 post-build:
-       ${CAT} ${FILESDIR}/buildscm.sh \
-               | ${SED} -e 's|@CC@|${CC}|g' \
-               | ${SED} -e 's|@CFLAGS@|${CFLAGS}|g' \
-               | ${SED} -e 's|@PREFIX@|${PREFIX}|g' \
-               > ${WRKSRC}/buildscm.sh
        cd ${WRKSRC} && ${SH} ./buildscm.sh
 
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/slibcat ${PREFIX}/share/scm
-       for f in ${INFO_FILES}; do                                      \
-               ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/info;           \
+       cd ${WRKSRC}; for f in *.info *.info-[0-9]*; do                 \
+               ${TEST} ! -f "$$f" ||                                   \
+               ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR};          \
        done
 
-.include "../../devel/ncurses/buildlink3.mk"
-.include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1824d2eb3271 -r 40a257adeaaf lang/scm/files/require.scm
--- a/lang/scm/files/require.scm        Tue Apr 04 20:16:58 2006 +0000
+++ b/lang/scm/files/require.scm        Tue Apr 04 20:47:21 2006 +0000
@@ -1,2 +1,2 @@
-(define (library-vicinity) "@LOCALBASE@/share/slib/")
+(define (library-vicinity) "@SLIB_PREFIX@/share/slib/")
 (load (in-vicinity (library-vicinity) "require"))