# HG changeset patch
# User jwe
# Date 854569120 0
# Node ID 044ff6e8b739e837be9aadc08b7b3e37f4a7370d
# Parent  5adf5280858c9c9ae83f0c95e162bf432a3675a9
[project @ 1997-01-29 20:18:39 by jwe]

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Wed Jan 29 00:18:55 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
+	* Makeconf.in: Use -M instead of -MM to generate dependencies.
+	Don't strip $(srcdir) from output.
+
 	* examples/Makefile.in (install): Install info-emacs-info and
 	info-emacs-octave-help in $(archlibdir).
 
diff --git a/Makeconf.in b/Makeconf.in
--- a/Makeconf.in
+++ b/Makeconf.in
@@ -274,13 +274,8 @@
 %.d : %.cc
 	@echo making $@ from $<
 	@rm -f $@
-	@-if test "$(srcdir)" = "." ; then \
-	  $(CXX) -MM $(CPPFLAGS) $(ALL_CXXFLAGS) $< | \
-	    sed -e 's,$*\.o,pic/& & $@,g' > $@.tmp ; \
-	else \
-	  $(CXX) -MM $(CPPFLAGS) $(ALL_CXXFLAGS) $< | \
-	    sed -e 's,$*\.o,pic/& & $@,g' -e 's,$(srcdir)/,,g' > $@.tmp ; \
-	fi
+	@$(CXX) -M $(CPPFLAGS) $(ALL_CXXFLAGS) $< | \
+	  sed -e 's,$*\.o,pic/& & $@,g' > $@.tmp
 	@mv $@.tmp $@
 
 # And one for .c files.too:
@@ -288,13 +283,8 @@
 %.d : %.c
 	@echo making $@ from $<
 	@rm -f $@
-	@-if test "$(srcdir)" = "." ; then \
-	  $(CC) -MM $(CPPFLAGS) $(ALL_CFLAGS) $< | \
-	    sed -e 's,$*\.o,pic/& & $@,g' > $@.tmp ; \
-	else \
-	  $(CC) -MM $(CPPFLAGS) $(ALL_CFLAGS) $< | \
-	    sed -e 's,$*\.o,pic/& & $@,g' -e 's,$(srcdir)/,,g' > $@.tmp ; \
-	fi
+	@$(CC) -M $(CPPFLAGS) $(ALL_CFLAGS) $< | \
+	  sed -e 's,$*\.o,pic/& & $@,g' > $@.tmp
 	@mv $@.tmp $@
 
 define do-subdir-for-command
diff --git a/README.Linux b/README.Linux
--- a/README.Linux
+++ b/README.Linux
@@ -41,7 +41,11 @@
 for the libraries.  If it is not, please ask the maintainers of the
 libraries to clarify the documentation.
 
-Please note that I am NOT
+Please note that I am NOT recommending that everyone running Linux and
+using Octave should install the same versions of the libraries and
+compilers that I have.  I am simply saying that the versions listed
+above work for me.  Other version combinations may also work, but I
+don't have time to map out all the possibilities...
 
 Octave won't even compile
 -------------------------
@@ -149,4 +153,4 @@
 University of Wisconsin-Madison
 Department of Chemical Engineering
 
-Wed Jan 15 20:04:54 1997
+Wed Jan 29 13:39:02 1997