diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile index 350679f4e33a6bdee10c5708b3b4b1eedbbc51af..a5eec7c756c4a7a05ad17e7ea96fd3e7c8d0fdbc 100644 --- a/ghc/lib/std/Makefile +++ b/ghc/lib/std/Makefile @@ -136,7 +136,11 @@ override datadir:=$(libdir)/imports/std INSTALL_LIBS += $(LIBRARY) ifeq "$(way)" "dll" INSTALL_PROGS += $(DLL_NAME) -INSTALL_LIBS += PrelMain.dll_o $(patsubst %.a,%_imp.a, $(LIBRARY)) +INSTALL_LIBS += PrelMain.dll_o +else +ifeq "$(EnableWin32Dlls)" "YES" +$(patsubst %.a,%_imp.a, $(LIBRARY)) +endif endif INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi ifeq "$(way)" "dll" diff --git a/ghc/lib/std/cbits/Makefile b/ghc/lib/std/cbits/Makefile index 3593d8d011c8922f9f6dc3bd2e1df67c273c6b8f..853da87df4e549ffe31286234700d02422eddbf1 100644 --- a/ghc/lib/std/cbits/Makefile +++ b/ghc/lib/std/cbits/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.18 2000/04/14 16:17:49 rrt Exp $ +# $Id: Makefile,v 1.19 2000/05/12 11:48:30 rrt Exp $ TOP = ../../.. include $(TOP)/mk/boilerplate.mk @@ -49,8 +49,10 @@ INSTALL_LIBS+=$(LIBRARY) ifeq "$(EnableWin32DLLs)" "YES" INSTALL_PROGS += $(DLL_NAME) +ifneq "$(way)" "dll" INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY)) endif +endif # install header files for the I/O library. Other code might want to # plug