--- a/dbm/src/Makefile.in
+++ b/dbm/src/Makefile.in
@@ -18,17 +18,17 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dbm
-LIBRARY_NAME	= $(MOZ_LIB_DBM_PREFIX)dbm
+LIBRARY_NAME	= mozdbm
 
 LIB_IS_C_ONLY	= 1
 
 CSRCS		= db.c \
 		  h_bigkey.c \
 		  h_func.c \
 		  h_log2.c \
 		  h_page.c \

--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@@ -1,38 +1,34 @@
-#!gmake
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.0 (the "NPL"); you may not use this file except in
 # compliance with the NPL.  You may obtain a copy of the NPL at
 # http://www.mozilla.org/NPL/
 #
 # Software distributed under the NPL is distributed on an "AS IS" basis,
 # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
 # for the specific language governing rights and limitations under the
 # NPL.
 #
 # The Initial Developer of this code under the NPL is Netscape
 # Communications Corporation.  Portions created by Netscape are
 # Copyright (C) 1998 Netscape Communications Corporation.  All Rights
 # Reserved.
+#
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dbm
 
-CSRCS		= lots.c
-
 PROGRAM		= lots
 
-#REQUIRES	= $(MOZ_LIB_DBM_PREFIX)dbm
+CSRCS		= lots.c
 
-LIBS		= \
-	-l$(MOZ_LIB_DBM_PREFIX)dbm \
-	$(NULL)
+LIBS		= -lmozdbm
 
 include $(topsrcdir)/config/rules.mk