Alexandre Julliard : makefiles: Avoid nested variable expansion that doesn' t work on BSD make.

Alexandre Julliard julliard at winehq.org
Thu Feb 26 09:04:58 CST 2009


Module: wine
Branch: master
Commit: a67d80b4a6107f7301f399f1b14d19e277fa022c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a67d80b4a6107f7301f399f1b14d19e277fa022c

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Feb 26 12:12:55 2009 +0100

makefiles: Avoid nested variable expansion that doesn't work on BSD make.

---

 dlls/Makedll.rules.in |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index c318bf2..ca9e972 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -10,7 +10,6 @@
 
 DLLFLAGS    = @DLLFLAGS@
 DLLEXT      = @DLLEXT@
-IMPLIBEXT   = @IMPLIBEXT@
 MINGWAR     = @MINGWAR@
 DEFS        = -D__WINESRC__ $(EXTRADEFS)
 BASEMODULE  = $(MODULE:%.dll=%)
@@ -20,7 +19,7 @@ WIN16_FILES = $(SPEC_SRCS16:.spec=.spec.o) $(C_SRCS16:.c=.o) $(EXTRA_OBJS16)
 ALL_OBJS    = @WIN16_FILES@ $(OBJS) $(RC_SRCS:.rc=.res)
 ALL_LIBS    = $(LIBPORT) $(EXTRALIBS) $(LDFLAGS) $(LIBS)
 IMPLIB_OBJS = $(IMPLIB_SRCS:.c=.o)
-IMPORTLIBFILE = $(IMPORTLIB:%=lib%.$(IMPLIBEXT))
+IMPORTLIBFILE = $(IMPORTLIB:%=lib%. at IMPLIBEXT@)
 STATICIMPLIB  = $(IMPORTLIBFILE:.def=.def.a)
 DLL_LDPATH  = -L$(DLLDIR) $(DELAYIMPORTS:%=-L$(DLLDIR)/%) $(IMPORTS:%=-L$(DLLDIR)/%)
 INSTALLDIRS = $(DESTDIR)$(dlldir) $(DESTDIR)$(datadir)/wine




More information about the wine-cvs mailing list