[project @ 2000-05-11 19:37:30 by rrt]

[ghc-hetmet.git] / ghc / lib / std / Makefile

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 542d536..08e1696 100644 (file)
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -87,10 +87,10 @@ PrelGHC.$(way_)hi   : PrelGHC.hi-boot
 
 boot :: PrelGHC.hi $(foreach way, $(WAYS), PrelGHC.$(way)_hi)
 
-DLL_NAME = HSprel.dll
+DLL_NAME = HSstd.dll
 DLL_DESCRIPTION="GHC-compiled Haskell Prelude"
 DLL_IMPLIB_NAME = libHSstd_imp.a
-SRC_BLD_DLL_OPTS += --export-all --output-def=HSprel.def DllVersionInfo.o
+SRC_BLD_DLL_OPTS += --export-all --output-def=HSstd.def DllVersionInfo.o
 SRC_BLD_DLL_OPTS += -lwinmm -lHSrts_imp -lHSstd_cbits_imp -lgmp -L. -L../../rts/gmp -L../../rts -Lcbits
 
 ifeq "$(way)" "dll"
@@ -134,11 +134,15 @@ override datadir:=$(libdir)/imports/std
 # Files to install from here
 # 
 INSTALL_LIBS  += $(LIBRARY)
-ifeq "$(EnableWin32DLLs)" "YES"
+ifeq "$(way)" "dll"
 INSTALL_PROGS += $(DLL_NAME)
-INSTALL_LIBS  += $(patsubst %.a, %_imp.a, $(LIBRARY)) PrelMain.dll_o
-INSTALL_DATAS += dLL_ifs.hi
+INSTALL_LIBS  += PrelMain.dll_o
+else
+INSTALL_LIBS  += $(patsubst %.a,%_imp.a, $(LIBRARY))
 endif
 INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi
+ifeq "$(way)" "dll"
+INSTALL_DATAS := $(filter-out PrelHugs.$(way_)hi,$(INSTALL_DATAS))
+endif
 
 include $(TOP)/mk/target.mk