carbon2-commit: Ensure LATE_PACKAGES_DIRECTORIES is a trivial search path.

[Aidan Kehoe]

changeset:   4371:146742e30f05ab3437ec96ac13b33feb2a8e3ba7
user:        Stephen J. Turnbull <stephen at xemacs.org>
date:        Wed Dec 26 22:38:40 2007 -0800
files:       ChangeLog Makefile.in.in etc/ChangeLog etc/bundled-packages/README
description:
Ensure LATE_PACKAGES_DIRECTORIES is a trivial search path.


diff -r b545430be2eb1d007008624cb1bce9d4eea9efff -r 146742e30f05ab3437ec96ac13b33feb2a8e3ba7 ChangeLog
--- a/ChangeLog	Wed Dec 26 22:21:45 2007 +0100
+++ b/ChangeLog	Wed Dec 26 22:38:40 2007 -0800
@@ -1,6 +1,11 @@ 2007-12-26  Stephen J. Turnbull  <stephe
 2007-12-26  Stephen J. Turnbull  <stephen at xemacs.org>
 
+	* Makefile.in.in (mkpkgdir): Ensure only one late package directory.
+
+2007-12-26  Stephen J. Turnbull  <stephen at xemacs.org>
+
 	* Makefile.in.in (check-available-packages): Say where to install.
+	(mkpkgdir): 
 
 2007-12-23  Stephen J. Turnbull  <stephen at xemacs.org>
 
diff -r b545430be2eb1d007008624cb1bce9d4eea9efff -r 146742e30f05ab3437ec96ac13b33feb2a8e3ba7 Makefile.in.in
--- a/Makefile.in.in	Wed Dec 26 22:21:45 2007 +0100
+++ b/Makefile.in.in	Wed Dec 26 22:38:40 2007 -0800
@@ -513,11 +513,18 @@ check-available-packages:
 	then echo "To install the full set of packages with mule in"; \
 	     echo "${package_path}/mule-packages, type:"; \
 	     echo "  make install-all-packages"; \
-	fi;
+	fi
+
+# The test for a non-trivial path simply checks for the conventional Unix
+# path separator ":".  This is reasonable because this is basically just
+# a convenience feature, anyway.
 
 mkpkgdir: FRC.mkdir ${MAKEPATH}
 	@if test -z ${package_path}; \
-	then echo "not configured --with-late-packages; no place to install."; \
+	then echo "Not configured --with-late-packages; no place to install."; \
+		exit -1; \
+	elif echo ${package_path} | grep ":"; \
+	then echo "Configured with multiple late package directories; you decide where to install."; \
 		exit -1; \
 	elif test -e ${package_path}/xemacs-packages \
 		-o -e ${package_path}/mule-packages; \
diff -r b545430be2eb1d007008624cb1bce9d4eea9efff -r 146742e30f05ab3437ec96ac13b33feb2a8e3ba7 etc/ChangeLog
--- a/etc/ChangeLog	Wed Dec 26 22:21:45 2007 +0100
+++ b/etc/ChangeLog	Wed Dec 26 22:38:40 2007 -0800
@@ -1,3 +1,7 @@ 2007-12-23  Stephen J. Turnbull  <stephe
+2007-12-26  Stephen J. Turnbull  <stephen at xemacs.org>
+
+	* bundled-packages/README: Document restriction on --with-late-packages.
+
 2007-12-23  Stephen J. Turnbull  <stephen at xemacs.org>
 
 	* bundled-packages/README: Documentation for bundled packages.
diff -r b545430be2eb1d007008624cb1bce9d4eea9efff -r 146742e30f05ab3437ec96ac13b33feb2a8e3ba7 etc/bundled-packages/README
--- a/etc/bundled-packages/README	Wed Dec 26 22:21:45 2007 +0100
+++ b/etc/bundled-packages/README	Wed Dec 26 22:38:40 2007 -0800
@@ -1,10 +1,13 @@ Package distributions may be placed in t
 Package distributions may be placed in this directory.
 If present and a package-path is configured, packages can be installed
-using the top-level makefile.
+using the top-level Makefile.
 
 To configure the package path, use the --with-late-packages option to
-configure, which specifies the path to the directory containing the
-xemacs-packages and mule-packages hierarchies to install.
+configure, which specifies a single directory in which to install the
+xemacs-packages and mule-packages hierarchies provided.  If this is null,
+or contains a Unix-style search path (i.e., a colon is present in the
+argument of the --with-late-packages option), you will have to install
+the packages by hand.
 
 To find out if a distribution includes bundled packages, type