Make it possible to prefix mozilla dlls that conflict with system dlls. N3 NSPRPUB_LIB3_NAME_CHANGE_BASE RDF_19990326_BASE RDF_SCRIPTABLE_19990317_BASE SeaMonkey_M3_BASE
authorramiro%netscape.com
Fri, 12 Mar 1999 12:42:44 +0000
changeset 111 d8debc661f2a9573149505951aeb15bf7644d4b5
parent 110 8b04528a63dd74321ad9d43466f93b696370f061
child 112 2c049067be09a358b16007ab5f759a59c7590dbe
child 113 abfdb44f013cabb166fd3a7b72b9eee6732180e1
child 114 bfe034407f4ce74a7d36abd01d632ccbc0323fc6
child 115 b3e62fda1fde1983aa35efb3bf91acc6ec0c8ea8
child 116 d221250983e09b40698129bac96b03fab779f446
child 117 050cebf213f48713b18b901827e3e2997e7e2ef3
push idunknown
push userunknown
push dateunknown
Make it possible to prefix mozilla dlls that conflict with system dlls.
dbm/src/Makefile.in
dbm/tests/Makefile.in
--- a/dbm/src/Makefile.in
+++ b/dbm/src/Makefile.in
@@ -20,17 +20,17 @@ CSRCS = db.c	   \
 	memmove.c  \
 	mktemp.c   \
 	ndbm.c	   \
 	snprintf.c \
 	strerror.c \
 	nsres.c	   \
 	$(NULL)
 
-LIBRARY_NAME = mozdbm
+LIBRARY_NAME = $(MOZ_LIB_DBM_PREFIX)dbm
 
 LOCAL_INCLUDES = -I$(srcdir)/../include
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG)
 
 ifeq ($(OS_ARCH),AIX)
--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@@ -23,16 +23,16 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= dbm
 
 CSRCS		= lots.c
 
 PROGRAM		= lots
 
-REQUIRES	= mozdbm
+#REQUIRES	= $(MOZ_LIB_DBM_PREFIX)dbm
 
 LIBS		= \
-	-lmozdbm \
+	-l$(MOZ_LIB_DBM_PREFIX)dbm \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk