From cae95bc73f99d6355a8783d643fd3883b2311f3d Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Tue, 25 Oct 2005 09:39:30 +0000
Subject: Minor fixes, cosmetics and a reminder

---
 lang/scm/Makefile          | 5 +++--
 lang/scm/files/buildscm.sh | 2 +-
 lang/scm/files/require.scm | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'lang')

diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 4d8d5fe5724..3b65ad095f6 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2005/10/25 09:32:15 adam Exp $
+# $NetBSD: Makefile,v 1.13 2005/10/25 09:39:30 adam Exp $
 #
 # Convert the version number as follows 2d2 -> 2.4.2, where the d is
 # changed to a 4, representing the 4th letter.
 # Thus, 5e1 -> 5.5.1
 #
+# Do not forget to update InitXXX.scm in files/buildscm.scm
 
 DISTNAME=	scm5e1
 PKGNAME=	scm-5.5.1
@@ -27,7 +28,7 @@ INSTALL_TARGET=	install installlib
 INFO_FILES=	scm.info hobbit.info Xlibscm.info
 
 post-patch:
-	${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+	${SED} -e 's|@LOCALBASE@|${LOCALBASE}|g' \
 		< ${FILESDIR}/require.scm > ${WRKSRC}/require.scm
 
 post-build:
diff --git a/lang/scm/files/buildscm.sh b/lang/scm/files/buildscm.sh
index 205ef3eb8da..5e2e859cd88 100644
--- a/lang/scm/files/buildscm.sh
+++ b/lang/scm/files/buildscm.sh
@@ -2,7 +2,7 @@
 # unix (unix) script created by SLIB/batch Thu Jul 17 21:20:04 2003
 # ================ Write file with C defines
 rm -f scmflags.h
-echo '#define IMPLINIT "@PREFIX@/share/scm/Init5d9.scm"'>>scmflags.h
+echo '#define IMPLINIT "@PREFIX@/share/scm/Init5e1.scm"'>>scmflags.h
 echo '#define INITS init_sc2();init_ramap();init_gsubr();init_ioext();init_posix();init_record();init_rgx();init_socket();init_unix();'>>scmflags.h
 echo '#define COMPILED_INITS init_edline();'>>scmflags.h
 echo '#define ARRAYS'>>scmflags.h
diff --git a/lang/scm/files/require.scm b/lang/scm/files/require.scm
index 537e08ee4a0..57e06a46119 100644
--- a/lang/scm/files/require.scm
+++ b/lang/scm/files/require.scm
@@ -1,2 +1,2 @@
-(define (library-vicinity) "%%LOCALBASE%%/share/slib/")
+(define (library-vicinity) "@LOCALBASE@/share/slib/")
 (load (in-vicinity (library-vicinity) "require"))
-- 
cgit v1.2.3