summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrrt <unknown>2000-05-11 11:05:32 +0000
committerrrt <unknown>2000-05-11 11:05:32 +0000
commit6199e336b1528546b677b657c0c78b256a2399fd (patch)
treea5b027a381b21b73a05bab07d68d7519591b9b41
parenta4017b8170d4366a090921f32e0c39134f754035 (diff)
downloadhaskell-6199e336b1528546b677b657c0c78b256a2399fd.tar.gz
[project @ 2000-05-11 11:05:32 by rrt]
Fix installing for DLLized Windows build.
-rw-r--r--ghc/lib/std/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 4284da407e..b0f985bc41 100644
--- a/ghc/lib/std/Makefile
+++ b/ghc/lib/std/Makefile
@@ -134,10 +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_LIBS += $(patsubst %.a, $(LIBRARY)) PrelMain.dll_o
+else
+INSTALL_LIBS += $(patsubst %_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