Commit a0523294 authored by rrt's avatar rrt
Browse files

[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).
parent 38536296
...@@ -136,7 +136,11 @@ override datadir:=$(libdir)/imports/std ...@@ -136,7 +136,11 @@ override datadir:=$(libdir)/imports/std
INSTALL_LIBS += $(LIBRARY) INSTALL_LIBS += $(LIBRARY)
ifeq "$(way)" "dll" ifeq "$(way)" "dll"
INSTALL_PROGS += $(DLL_NAME) 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 endif
INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi
ifeq "$(way)" "dll" ifeq "$(way)" "dll"
......
# $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 = ../../.. TOP = ../../..
include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/boilerplate.mk
...@@ -49,8 +49,10 @@ INSTALL_LIBS+=$(LIBRARY) ...@@ -49,8 +49,10 @@ INSTALL_LIBS+=$(LIBRARY)
ifeq "$(EnableWin32DLLs)" "YES" ifeq "$(EnableWin32DLLs)" "YES"
INSTALL_PROGS += $(DLL_NAME) INSTALL_PROGS += $(DLL_NAME)
ifneq "$(way)" "dll"
INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY)) INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBRARY))
endif endif
endif
# install header files for the I/O library. Other code might want to # install header files for the I/O library. Other code might want to
# plug # plug
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment