From f7acd836c7ba906025ccc6860104d77946089336 Mon Sep 17 00:00:00 2001 From: Earnie Boyd Date: Sat, 14 Sep 2013 11:42:24 -0400 Subject: [PATCH] The DLL name for winspool is actually winspool.drv. --- ChangeLog | 7 +++++++ Makefile.in | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e7ba49b..f868928 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-09-14 Earnie Boyd + + The winspool DLL name is actually winspool.drv. + + * Makefile.in: Conditionalize the DLL name specification for + libwinspool.a. + 2013-08-01 Earnie Boyd Correct typo causing errors under some conditions. diff --git a/Makefile.in b/Makefile.in index 377cfd2..fa5d626 100644 --- a/Makefile.in +++ b/Makefile.in @@ -686,7 +686,11 @@ $(moldname_DEF): lib/lib32/moldname.def.in SRCDIR := lib/lib32 $(notdir $(winapi_lib_LIBRARIES)): $(addprefix lib/lib32/,$(winapi_DEF)) @echo Making library $@ from $(subst lib,,$(@:.a=.def)). - $(DLLTOOL) $(DLLTOOL_FLAGS) $(subst lib,,$(@:.a=.dll)) --def $(addprefix $(top_srcdir)/lib/lib32/,$(subst lib,,$(@:.a=.def))) --output-lib $@ + if test $@ = libwinspool.a; then \ + $(DLLTOOL) $(DLLTOOL_FLAGS) $(subst lib,,$(@:.a=.drv)) --def $(addprefix $(top_srcdir)/lib/lib32/,$(subst lib,,$(@:.a=.def))) --output-lib $@ ; \ + else \ + $(DLLTOOL) $(DLLTOOL_FLAGS) $(subst lib,,$(@:.a=.dll)) --def $(addprefix $(top_srcdir)/lib/lib32/,$(subst lib,,$(@:.a=.def))) --output-lib $@ ; \ + fi $(RANLIB) $@ $(notdir $(winapi_mri_LIBRARIES)): $(addprefix lib/lib32/,$(winapi_MRI)) -- 2.11.0