[project @ 2000-05-12 11:48:30 by rrt]

Fix install rules for _imp libraries under Windows. They must only be
installed if EnableWin32Dlls is YES, but not in the dll way (otherwise
a spurious _dll is inserted into the library name).

diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile
index 350679f..a5eec7c 100644 (file)
--- 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 3593d8d..853da87 100644 (file)
--- 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