diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c2ebe9645a..f442ae61ee 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,13 @@
+Fri Oct 28 16:16:52 1994  Stan Shebs  (shebs@andros.cygnus.com)
+
+	* Makefile.in (MMALLOC_DIR): New definition.
+	(MMALLOC): Use MMALLOC_DIR.
+	(MMALLOC_CFLAGS): Look in MMALLOC_DIR for mmalloc.h.
+	(OPCODES): Remove gratuitous "./".
+	* defs.h (mmalloc.h): Include.
+	(mmalloc, mrealloc, etc): Remove decls.
+	(cplus_demangle, cplus_demangle_opname): Remove decls.
+
 Wed Oct 26 15:41:07 1994  Stu Grossman  (grossman@cygnus.com)
 
 	* defs.h, gdbtk.c, main.c, top.c:  Change sense and name of
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 815c98a468..2efb7e55a8 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -82,20 +82,22 @@ CC-LD=$(CC)
 # routines in libiberty.
 INCLUDE_DIR =  $(srcdir)/../include
 INCLUDE_CFLAGS = -I$(INCLUDE_DIR)
-# Where is the "-liberty" library, containing getopt and obstack?
+
+# Where is the "-liberty" library?  Typically in ../libiberty.
 LIBIBERTY = ../libiberty/libiberty.a
 
-# Where is the MMALLOC library?  Typically ../mmalloc.
+# Where is the MMALLOC library?  Typically in ../mmalloc.
 # Note that mmalloc can still be used on systems without mmap().
 # To use your system malloc, comment out the following defines.
-MMALLOC = ../mmalloc/libmmalloc.a
+MMALLOC_DIR = ../mmalloc
+MMALLOC = $(MMALLOC_DIR)/libmmalloc.a
 # To use your system malloc, uncomment MMALLOC_DISABLE.
 #MMALLOC_DISABLE = -DNO_MMALLOC
 # To use mmalloc but disable corruption checking, uncomment MMALLOC_CHECK
 #MMALLOC_CHECK = -DNO_MMALLOC_CHECK
-MMALLOC_CFLAGS = $(MMALLOC_CHECK) $(MMALLOC_DISABLE)
+MMALLOC_CFLAGS = -I$(srcdir)/$(MMALLOC_DIR) $(MMALLOC_CHECK) $(MMALLOC_DISABLE)
 
-# Where are the BFD library?
+# Where is the BFD library?  Typically in ../bfd.
 BFD_DIR = ../bfd
 BFD = $(BFD_DIR)/libbfd.a
 BFD_SRC = $(srcdir)/$(BFD_DIR)
@@ -112,7 +114,7 @@ READLINE_CFLAGS = -I$(READLINE_SRC)
 # in INCLUDE_DIR.
 # Where is the "-lopcodes" library, with (some of) the opcode tables and
 # disassemblers?
-OPCODES = ./../opcodes/libopcodes.a
+OPCODES = ../opcodes/libopcodes.a
 # Where are the other opcode tables which only have header file
 # versions?
 OP_INCLUDE = $(INCLUDE_DIR)/opcode