From: Adam Chlipala <adamc@hcoop.net>
Date: Thu, 23 Sep 2004 14:20:31 +0000 (+0000)
Subject: Automatically generate mlt.conf
X-Git-Url: http://git.hcoop.net/bpt/mlt.git/commitdiff_plain/eb3c2c898389cd99030a60a95a421b5ab5db18ad

Automatically generate mlt.conf
---

diff --git a/.cvsignore b/.cvsignore
index 51fa51e..bf79287 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 .cm
-settings.sml
\ No newline at end of file
+settings.sml
+mlt.conf
\ No newline at end of file
diff --git a/BUILDING b/BUILDING
index 2c9a6a7..298ede8 100644
--- a/BUILDING
+++ b/BUILDING
@@ -15,29 +15,23 @@ Configuration
 
 Modify the parameters in settings as appropriate for your system.
 
-If it is possible for you to modify a file /etc/mlt.conf, then you can
-edit this file to set various options related to locations of
-important files on your file system. In particular, you may want to
-set the 'compiler', 'lib', and 'sml' options (documented in the
-manual) if you have SML/NJ installed somewhere besides /usr/local/sml
-or the mlt src directory somewhere besides /usr/local/share/mlt/src.
-If you can't modify /etc/mlt.conf, then you can change the DEFAULT
-option in settings to a different path, or you can leave it as is and
-provide all configuration in the local mlt.conf file for each project.
-
-These changes may be made for you by a fancy configuration program in
-a future release.
+These settings may be determined for you autotmatically by a fancy
+configuration program in a future release.
 
 
 ========
 Building
 ========
 
-All sources may be built by running the build script in this
+All sources may be built by running the 'build' script in this
 directory. It does a clean re-build of all source files and stabilizes
 all libraries produced. The build script is not appropriate for use
 during development. Use the standard SML/NJ CM mechanisms if you are
 changing the code and don't want to recompile everything each time.
 
+The 'install' script installs the 'mlt' program to the BINDIR
+specified in settings. You can also copy the generated mlt.conf file to
+/etc or wherever else you specified for the DEFAULT setting.
+
 [There is probably a better way to do this, but I haven't figured one
 out yet.]
diff --git a/build b/build
index 3a81c01..24c1c56 100755
--- a/build
+++ b/build
@@ -12,6 +12,10 @@ echo "    val smlbin = \"$SMLBIN\"" >>settings.sml
 echo "    val mltdir = \"$MLTDIR\"" >>settings.sml
 echo end >>settings.sml
 
+echo "compiler $MLTDIR/src/sources.cm" >mlt.conf
+echo "lib $MLTDIR/src/lib/sources.cm" >>mlt.conf
+cat mlt.conf.base >>mlt.conf
+
 cd src
 
 if [ -f mlt.$PLATFORM ] ; then
diff --git a/mlt.conf b/mlt.conf.base
similarity index 69%
rename from mlt.conf
rename to mlt.conf.base
index 4c58410..ac37f8a 100644
--- a/mlt.conf
+++ b/mlt.conf.base
@@ -1,5 +1,3 @@
-compiler	/home/adam/cvs/mlt/src/sources.cm
-lib		/home/adam/cvs/mlt/src/lib/sources.cm
 
 print unit =
 print int = (Web.print o Int.toString)
diff --git a/settings b/settings
index 6a480c9..0e42a73 100644
--- a/settings
+++ b/settings
@@ -1,5 +1,14 @@
 BIN=/usr/local/bin
+# Directory where programs will be installed
+
 SMLBIN=/usr/local/sml/bin
+# Location of SML/NJ tools
+
 PLATFORM=x86-linux
+# The suffix SML/NJ uses for heaps on your platform
+
 MLTDIR=/usr/local/share/mlt
-DEFAULT=/etc/mlt.conf
\ No newline at end of file
+# Where you installed the mlt tree
+
+DEFAULT=/etc/mlt.conf
+# Path to default configuration file
\ No newline at end of file