2 files changed, 7 insertions, 5 deletions
diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
index 30503b8c..f0b6b596 100644
--- a/pr/src/Makefile.in
+++ b/pr/src/Makefile.in
@@ -41,6 +41,7 @@ ifeq ($(USE_CPLUS), 1)
 endif
 
 ifndef USE_AUTOCONF
+
 #
 # Define platform-dependent OS_LIBS
 #
@@ -157,7 +158,7 @@ endif
 endif
 endif
 
-endif # !USE_AUTOCONF
+endif # USE_AUTOCONF
 #
 # Define platform-dependent OBJS
 #
@@ -250,7 +251,7 @@ endif
 
 ifdef USE_AUTOCONF
 
-OBJS += $(addprefix md/$(PR_MD_ARCH_DIR)/$(OBJDIR)/, $(PR_MD_CSRCS:.c=.$(OBJ_SUFFIX)))
+include $(srcdir)/md/$(PR_MD_ARCH_DIR)/objs.mk
 
 else
 
@@ -422,3 +423,4 @@ $(AIX_RTL_LIBC): /usr/ccs/lib/libc.a
 endif
 
 install:: export
+
diff --git a/pr/src/md/windows/Makefile.in b/pr/src/md/windows/Makefile.in
index 1633bc49..6e462ebc 100644
--- a/pr/src/md/windows/Makefile.in
+++ b/pr/src/md/windows/Makefile.in
@@ -27,8 +27,9 @@ include $(MOD_DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 ifdef USE_AUTOCONF
-CSRCS = $(PR_MD_CSRCS)
-else
+OS_TARGET=$(MOZ_TARGET)
+endif
+
 ifeq ($(OS_TARGET), WIN16)
 CSRCS = \
 	w16null.c \
@@ -73,7 +74,6 @@ CSRCS =          \
     $(NULL)
 endif
 endif
-endif # USE_AUTOCONF
 
 TARGETS	= $(OBJS)