From efcd3f2b7aabe23e30ab482db1ed2eee5075e095 Mon Sep 17 00:00:00 2001 From: rrt Date: Thu, 11 May 2000 19:37:50 +0000 Subject: [PATCH] [project @ 2000-05-11 19:37:30 by rrt] Corrected use of patsubst. --- ghc/lib/std/Makefile | 4 ++-- ghc/rts/Makefile | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/ghc/lib/std/Makefile b/ghc/lib/std/Makefile index b0f985b..08e1696 100644 --- a/ghc/lib/std/Makefile +++ b/ghc/lib/std/Makefile @@ -136,9 +136,9 @@ override datadir:=$(libdir)/imports/std INSTALL_LIBS += $(LIBRARY) ifeq "$(way)" "dll" INSTALL_PROGS += $(DLL_NAME) -INSTALL_LIBS += $(patsubst %.a, $(LIBRARY)) PrelMain.dll_o +INSTALL_LIBS += PrelMain.dll_o else -INSTALL_LIBS += $(patsubst %_imp.a, $(LIBRARY)) +INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY)) endif INSTALL_DATAS += $(HS_IFACES) PrelGHC.$(way_)hi ifeq "$(way)" "dll" diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile index 35e417b..3353c65 100644 --- a/ghc/rts/Makefile +++ b/ghc/rts/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.24 2000/05/11 12:50:51 rrt Exp $ +# $Id: Makefile,v 1.25 2000/05/11 19:37:30 rrt Exp $ # # This is the Makefile for the runtime-system stuff. # This stuff is written in C (and cannot be written in Haskell). @@ -185,9 +185,8 @@ INSTALL_LIBS += $(LIBRARY) ifeq "$(EnableWin32DLLs)" "YES" INSTALL_PROGS += $(DLL_NAME) gmp/gmp.dll ifneq "$(way)" "dll" -INSTALL_LIBS += $(patsubst %_imp.a, $(LIBARY)) +INSTALL_LIBS += $(patsubst %.a, %_imp.a, $(LIBARY)) endif -INSTALL_LIBS += $(patsubst %.a, $(LIBRARY)) INSTALL_LIBS += gmp/libgmp_imp.a Main.dll_o endif -- 1.7.10.4