Use ${DYLAN_VERSION}, instead of a hardcoded 2.3.6, in the Makefile.common,

Makefile and PLIST files, using PLIST_SUBST accordingly.

Also use an ALT_ARCH definition, with PLIST_SUBST, to make the two PLISTS
more generic, and set up ALT_ARCH accordingly.

2 files changed, 70 insertions, 70 deletions

diff --git a/lang/dylan-compiler/Makefile b/lang/dylan-compiler/Makefile
index 36447f49ee8..cd914528918 100644
--- a/lang/dylan-compiler/Makefile
+++ b/lang/dylan-compiler/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/01/15 20:14:33 agc Exp $
+# $NetBSD: Makefile,v 1.2 2002/01/16 10:42:49 agc Exp $
 #
 
-PKGNAME=	dylan-compiler-2.3.6
+PKGNAME=	dylan-compiler-${DYLAN_VERSION}
 
 PATCHDIR=	${.CURDIR}/../dylan-interpreter/patches
 DISTINFO_FILE=	${.CURDIR}/../dylan-interpreter/distinfo
diff --git a/lang/dylan-compiler/PLIST b/lang/dylan-compiler/PLIST
index c6fc8f15613..83193b8e067 100644
--- a/lang/dylan-compiler/PLIST
+++ b/lang/dylan-compiler/PLIST
@@ -1,71 +1,71 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/15 20:14:33 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/16 10:42:49 agc Exp $
 bin/d2c
 bin/dybug
 bin/mindy
 bin/mindycomp
 bin/mindyexec
 include/runtime.h
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/base-file-system-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/base-file-system.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/collection-extensions-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/collection-extensions.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/dylan-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/dylan.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/format-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/format-out-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/format-out.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/format.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/garbage-collection.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/inspector-base-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libbase-file-system-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libcollection-extensions-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libdylan-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libformat-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libformat-out-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libgarbage-collection-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libgc.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libmatrix-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libmelange-support-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libparse-arguments-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libprint-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/librandom-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libregular-expressions-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libruntime.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libstandard-io-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libstream-extensions-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libstreams-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libstring-extensions-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libtable-extensions-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libtime-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/libtranscendental-dylan.a
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/matrix-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/matrix.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/melange-support.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/parse-arguments-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/parse-arguments.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/print-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/print.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/random-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/random.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/regular-expressions-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/regular-expressions.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/standard-io-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/standard-io.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/stream-extensions-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/stream-extensions.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/streams-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/streams.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/string-extensions-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/string-extensions.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/table-extensions-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/table-extensions.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/text-inspector-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/time-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/time.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/tk-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/transcendental-lib.dbc
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/transcendental.lib.du
-lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/x-inspector-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/base-file-system-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/base-file-system.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/collection-extensions-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/collection-extensions.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/dylan-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/dylan.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/format-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/format-out-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/format-out.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/format.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/garbage-collection.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/inspector-base-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libbase-file-system-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libcollection-extensions-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libdylan-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libformat-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libformat-out-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libgarbage-collection-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libgc.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libmatrix-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libmelange-support-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libparse-arguments-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libprint-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/librandom-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libregular-expressions-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libruntime.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libstandard-io-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libstream-extensions-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libstreams-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libstring-extensions-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libtable-extensions-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libtime-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/libtranscendental-dylan.a
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/matrix-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/matrix.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/melange-support.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/parse-arguments-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/parse-arguments.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/print-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/print.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/random-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/random.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/regular-expressions-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/regular-expressions.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/standard-io-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/standard-io.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/stream-extensions-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/stream-extensions.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/streams-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/streams.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/string-extensions-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/string-extensions.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/table-extensions-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/table-extensions.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/text-inspector-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/time-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/time.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/tk-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/transcendental-lib.dbc
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/transcendental.lib.du
+lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/x-inspector-lib.dbc
 man/man1/d2c.1
 man/man1/dybug.1
 man/man1/make-dylan-app.1
@@ -79,10 +79,10 @@ man/man7/dylan.7
 man/man7/gwydion.7
 share/dylan/platforms.descr
 @dirrm share/dylan
-@exec /bin/mkdir -p %D/lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/elisp
-@dirrm lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/elisp
-@exec /bin/mkdir -p %D/lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/dylan-user
-@dirrm lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc/dylan-user
-@dirrm lib/dylan/2.3.6/x86-${LOWER_OPSYS}-gcc
-@dirrm lib/dylan/2.3.6
+@exec /bin/mkdir -p %D/lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/elisp
+@dirrm lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/elisp
+@exec /bin/mkdir -p %D/lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/dylan-user
+@dirrm lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc/dylan-user
+@dirrm lib/dylan/${DYLAN_VERSION}/${ALT_ARCH}-${LOWER_OPSYS}-gcc
+@dirrm lib/dylan/${DYLAN_VERSION}
 @dirrm lib/dylan