# HG changeset patch
# User jwe
# Date 963896705 0
# Node ID e313f24b88ef24a4942c6dfad68df8f5f2024f86
# Parent  47d8d41d6ac639fdb3f39abb212af7ebd19fa26f
[project @ 2000-07-18 05:05:04 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-18  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* octMakefile.in (DISTSUBDIRS): Define in terms of $(ALL_SUBDIRS).
+
 2000-07-17  Joao Cardoso  <jcardoso@inescn.pt>
 
 	* configure.in (LIBGLOB): Set to be the two object files in the
diff --git a/libcruft/ChangeLog b/libcruft/ChangeLog
--- a/libcruft/ChangeLog
+++ b/libcruft/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-18  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makefile.in (DISTSUBDIRS): New macro.
+	(dist): Use it instead of SUBDIRS.
+
 2000-06-30  Steven G. Johnson  <stevenj@alum.mit.edu>
 
 	* blas-xtra, lapack-xtra: New directories.
diff --git a/libcruft/Makefile.in b/libcruft/Makefile.in
--- a/libcruft/Makefile.in
+++ b/libcruft/Makefile.in
@@ -34,6 +34,8 @@
 
 SUBDIRS = $(CRUFT_DIRS)
 
+DISTSUBDIRS = $(sort $(CRUFT_DIRS) blas lapack)
+
 DISTFILES = Makefile.in ChangeLog Makerules.in $(SOURCES) STOP.patch
 
 ifeq ($(SHARED_LIBS), true)
@@ -158,7 +160,7 @@
 	if $(SHARED_LIBS); then rm -f *.$(SHLEXT_VER); fi
 
 dist:
-	for dir in $(SUBDIRS); do mkdir ../`cat ../.fname`/libcruft/$$dir; $(MAKE) -C $$dir $@; done
+	for dir in $(DISTSUBDIRS); do mkdir ../`cat ../.fname`/libcruft/$$dir; $(MAKE) -C $$dir $@; done
 	ln $(DISTFILES) ../`cat ../.fname`/libcruft
 .PHONY: dist
 
diff --git a/octMakefile.in b/octMakefile.in
--- a/octMakefile.in
+++ b/octMakefile.in
@@ -46,8 +46,7 @@
 CONF_DISTSUBDIRS = src
 
 # Subdirectories in which to run `make dist'.
-DISTSUBDIRS = libcruft liboctave dlfcn src scripts \
-	test doc emacs examples
+DISTSUBDIRS = $(sort $(ALL_SUBDIDRS) readline dlfcn glob kpathsea test emacs)
 
 XBINDISTFILES = BUGS COPYING INSTALL INSTALL.OCTAVE NEWS NEWS.[0-9] \
 	PROJECTS README README.Linux README.Windows README.MachTen \