[[project @ 2001-06-27 20:31:25 by ghouston]
ghouston**20010627203125
 Ignore-this: fee6f8ce8bf13e0fc3dd0b7214051220
 	* configure.in: converted for autoconf 2.50: remove AC_INIT arg,
 	add AC_CONFIG_SRCDIR.
 	(GUILE_SCSH_DIR): removed.  don't install to directory
 	reported by guile-config, but use the datadir which is
 	derived from prefix by default.
 	don't test for guile-config.
 	add rx/Makefile.
 	* Makefile.am (pkgdatadir): derive it from datadir.
 	add rx to SUBDIRS.  remove mkinstalldirs rx hack from
 	install-exec-local.
 	(EXTRA_DIST): fix the RHS.
 	(pkgdata_DATA): remove rx subdir files.
 	* rx/Makefile.am: new file.
 	* README: updated.
] addfile ./rx/Makefile.am
hunk ./ChangeLog 1
+2001-06-27  Gary Houston  <ghouston@arglist.com>
+
+	* configure.in: converted for autoconf 2.50: remove AC_INIT arg,
+	add AC_CONFIG_SRCDIR.
+	(GUILE_SCSH_DIR): removed.  don't install to directory
+	reported by guile-config, but use the datadir which is
+	derived from prefix by default.
+	don't test for guile-config.
+	add rx/Makefile.
+	* Makefile.am (pkgdatadir): derive it from datadir.
+	add rx to SUBDIRS.  remove mkinstalldirs rx hack from
+	install-exec-local.
+	(EXTRA_DIST): fix the RHS.
+	(pkgdata_DATA): remove rx subdir files.
+	* rx/Makefile.am: new file.
+	* README: updated.
+
hunk ./Makefile.am 3
-# AUTOMAKE_OPTIONS = foreign
-
-pkgdatadir = @GUILE_SCSH_DIR@
+pkgdatadir = ${datadir}/guile/site/scsh
hunk ./Makefile.am 16
-	rx/cond-package.scm rx/let-match.scm rx/oldfuns.scm \
-	rx/parse.scm rx/posixstr.scm rx/re-fold.scm rx/re-high.scm \
-	rx/re-low.scm rx/re-subst.scm \
-	rx/re-syntax.scm rx/re.scm rx/rx-lib.scm rx/simp.scm rx/spencer.scm \
hunk ./Makefile.am 25
-EXTRA_DIST = $pkgdatadir_DATA $rxdata_DATA \
-	INCOMPAT USAGE make-module-list autogen.sh
+EXTRA_DIST = $(pkgdata_DATA) INCOMPAT USAGE make-module-list autogen.sh
+
+SUBDIRS = rx
hunk ./README 1
-This is an incomplete port of the scheme shell, scsh 0.5.2, to Guile.
+This is an incomplete port of the Scheme Shell, scsh 0.5.2, to Guile.
hunk ./README 15
-(although some scsh modules can still be used if it's not installed.)
+A few guile-scsh modules can still be used if it's not installed.
+It's possible to install guile-scsh first and guilerxspencer later.
hunk ./README 24
-./configure
+./configure --prefix=<see below>
hunk ./README 27
-The configure script will attempt to locate the Guile site directory,
-as reported by guile-config in the current PATH.  Supplying a prefix
-argument to configure doesn't have any effect.
+The prefix given to configure should probably match the prefix where
+Guile's site directory can be found.  Otherwise Guile won't find the
+module without further configuration.  E.g.,
+
+--prefix=/usr --> /usr/share/guile/site
+--prefix=/usr/local --> /usr/local/share/guile/site
hunk ./README 39
-See the USAGE file for notes on using the library.
+See the USAGE file for notes on using the library and INSTALL for 
+generic configure documentation.
hunk ./configure.in 2
-AC_INIT(scsh.scm)
+AC_INIT
+AC_CONFIG_SRCDIR(scsh.scm)
+AC_CONFIG_FILES(rx/Makefile)
hunk ./configure.in 6
-
-AC_CHECK_PROG(have_guile, guile-config, yes, no)
-if test $have_guile = no; then
-   AC_MSG_ERROR([guile-config not found])
-fi
-GUILE_SCSH_DIR=`guile-config info pkgdatadir`/site/scsh
-AC_MSG_RESULT(* directory for make install is $GUILE_SCSH_DIR)
-AC_SUBST(GUILE_SCSH_DIR)
hunk ./rx/Makefile.am 1
+subpkgdatadir = $(datadir)/guile/site/scsh/rx
+subpkgdata_DATA = cond-package.scm let-match.scm oldfuns.scm parse.scm\
+		  posixstr.scm re-fold.scm re-high.scm re-low.scm\
+		  re-subst.scm re-syntax.scm re.scm rx-lib.scm simp.scm\
+		  spencer.scm
+EXTRA_DIST = $(subpkgdata_DATA)