From 67e7e23f4845bc97f9989635a9acfc304ba9fc04 Mon Sep 17 00:00:00 2001
From: sam <sam@55e467fa-43c5-0310-a8a2-de718669efc6>
Date: Mon, 25 Aug 2003 12:50:11 +0000
Subject: [PATCH]   * scm/Makefile.am:     + Deprecated siteinfo.scm.     +
 Distribute .scm files in /usr/share/elk.

git-svn-id: svn://svn.zoy.org/elk/trunk@31 55e467fa-43c5-0310-a8a2-de718669efc6
---
 scm/Makefile.am    | 27 +++++++++++++++++++
 scm/build          | 66 ---------------------------------------------
 scm/build-siteinfo | 67 ----------------------------------------------
 scm/xlib.scm       |  2 --
 scm/xt.scm         |  2 --
 5 files changed, 27 insertions(+), 137 deletions(-)
 delete mode 100755 scm/build
 delete mode 100755 scm/build-siteinfo

diff --git a/scm/Makefile.am b/scm/Makefile.am
index e69de29..31afdad 100644
--- a/scm/Makefile.am
+++ b/scm/Makefile.am
@@ -0,0 +1,27 @@
+NULL = 
+pkgdata_DATA = \
+	apropos.scm \
+	bitstring.scm \
+	cscheme.scm \
+	debug.scm \
+	describe.scm \
+	gdbmtest.scm \
+	initscheme.scm \
+	motif.scm \
+	oops.scm \
+	parse.scm \
+	pp.scm \
+	qsort.scm \
+	record.scm \
+	recordutil.scm \
+	regexp.scm \
+	safe-env.scm \
+	setf.scm \
+	struct.scm \
+	toplevel.scm \
+	trace.scm \
+	unix.scm \
+	xlib.scm \
+	xt.scm \
+	xwidgets.scm \
+	$(NULL)
diff --git a/scm/build b/scm/build
deleted file mode 100755
index e695a3b..0000000
--- a/scm/build
+++ /dev/null
@@ -1,66 +0,0 @@
-. ../config/system
-. ../config/site
-
-echo Building Makefile.local...
-cat >Makefile.local <<EOT
-# This Makefile was produced by running ./build in this directory.
-
-SHELL=/bin/sh
-
-FILES= apropos.scm\\
-       bitstring.scm\\
-       cscheme.scm\\
-       debug.scm\\
-       describe.scm\\
-       gdbmtest.scm\\
-       initscheme.scm\\
-       motif.scm\\
-       oops.scm\\
-       parse.scm\\
-       pp.scm\\
-       qsort.scm\\
-       record.scm\\
-       recordutil.scm\\
-       regexp.scm\\
-       safe-env.scm\\
-       setf.scm\\
-       siteinfo.scm\\
-       struct.scm\\
-       toplevel.scm\\
-       trace.scm\\
-       unix.scm\\
-       xlib.scm\\
-       xt.scm\\
-       xwidgets.scm
-
-TARGETS= siteinfo.scm
-
-all:      \$(TARGETS)
-
-localize: \$(TARGETS)
-
-siteinfo.scm: ../config/system ../config/site
-	\$(SHELL) ./build-siteinfo
-
-install: \$(TARGETS)
-	-@if [ ! -d $install_dir/share ]; then \\
-	    echo mkdir $install_dir/share; \\
-	    mkdir $install_dir/share; \\
-	fi
-	-@if [ ! -d $install_dir/share/elk ]; then \\
-	    echo mkdir $install_dir/share/elk; \\
-	    mkdir $install_dir/share/elk; \\
-	fi
-	@for i in \$(FILES) ;\\
-	do \\
-	    echo cp \$\$i $install_dir/share/elk; \\
-	    cp \$\$i $install_dir/share/elk; \\
-	done
-
-lint:
-
-clean:
-
-distclean:
-	rm -f \$(TARGETS) Makefile.local
-EOT
diff --git a/scm/build-siteinfo b/scm/build-siteinfo
deleted file mode 100755
index c76794f..0000000
--- a/scm/build-siteinfo
+++ /dev/null
@@ -1,67 +0,0 @@
-. ../config/system
-. ../config/site
-
-if [ _$load_obj = _ld -o _$load_obj = _dl ]; then
-    force_load_xm="-u ${syms_begin_with}XmIsMotifWMRunning"
-fi
-
-# In HP-UX, the Motif libraries must be linked with xt-motif.o instead
-# of placing them into the load-libraries (I don't know why).  So just
-# flush $libxmotif at this point.
-
-if [ _$load_obj = _shl ]; then
-    libxmotif=
-fi
-
-# Take apart $system:
-
-IFS=-
-set $system
-machine=$1
-os=$2
-cc=$3
-
-# Get version number
-
-rel=`../util/getversion ../README`
-IFS=.
-set $rel
-major=$1
-minor=$2
-IFS=
-
-echo Building siteinfo.scm
-cat <<EOT >siteinfo.scm
-;;; -*-Scheme-*-
-;;;
-;;; This file has been produced automatically from the information in
-;;; your config/system and config/site files.  Do not edit!
-
-
-;;; Miscellaneous parameters from config/system:
-
-(define site-machine "$machine")
-(define site-os      "$os")
-(define site-cc      "$cc")
-
-(define site-version '($major . $minor))
-
-
-;;; Various pathnames/options for dynamically loading the X extensions:
-
-(define site-lib-xlib
-   "$libxlib")
-
-(define site-lib-xt
-   "$libxt")
-
-(define site-lib-xaw
-   "$libxaw")
-
-(define site-lib-xmotif
-   "$libxmotif")
-
-(define site-force-load-xm "$force_load_xm")
-
-(provide 'siteinfo)
-EOT
diff --git a/scm/xlib.scm b/scm/xlib.scm
index fa5df3c..416270b 100644
--- a/scm/xlib.scm
+++ b/scm/xlib.scm
@@ -2,8 +2,6 @@
 ;;;
 ;;; The Scheme part of the Xlib extension.
 
-(require 'siteinfo)
-
 (fluid-let ((load-libraries (string-append site-lib-xlib " " load-libraries)))
   (require 'xlib.so))
 
diff --git a/scm/xt.scm b/scm/xt.scm
index b3ad995..864e85a 100644
--- a/scm/xt.scm
+++ b/scm/xt.scm
@@ -2,8 +2,6 @@
 ;;;
 ;;; The Scheme part of the Xt extension.
 
-(require 'siteinfo)
-
 (if (feature? 'motif)
     (fluid-let ((load-libraries
 		  (string-append site-force-load-xm " " site-lib-xmotif " "