From bc91aa29453b6bbb822f2bfb39bae88b1db41a31 Mon Sep 17 00:00:00 2001
From: Jay Berkenbilt <ejb@ql.org>
Date: Sun, 8 Aug 2010 22:13:24 +0000
Subject: tweak shared library creation

git-svn-id: svn+q:///qpdf/trunk@1007 71b93d88-0707-0410-a8cf-f5a4172ac649
---
 make/msvc.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'make/msvc.mk')

diff --git a/make/msvc.mk b/make/msvc.mk
index 481566c0..700d2aa8 100644
--- a/make/msvc.mk
+++ b/make/msvc.mk
@@ -65,16 +65,16 @@ endef
 #                       1    2       3       4    5       6        7
 # Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age)
 define makelib
-	major=$$(( $(5) - $(7))); \
-	cl /nologo /O2 /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$(major).dll \
+	major=$$(( $(5) - $(7) )); \
+	cl /nologo /O2 /Zi /Gy /EHsc /MD /LD /Fe$(basename $(2))$${major}.dll \
 		$(1) /link /incremental:no \
 		$(foreach L,$(subst -L,,$(3)),/LIBPATH:$(L)) \
-		$(foreach L,$(subst -l,,$(4)),$(L).lib)
-	if [ -f $(basename $(2))$(major).dll.manifest ]; then \
-		mt.exe -nologo -manifest $(basename $(2))$(major).dll.manifest \
-			-outputresource:$(basename $(2))$(major).dll\;2; \
-	fi
-	mv $(basename $(2))$(major).lib $(2)
+		$(foreach L,$(subst -l,,$(4)),$(L).lib) && \
+	if [ -f $(basename $(2))$${major}.dll.manifest ]; then \
+		mt.exe -nologo -manifest $(basename $(2))$${major}.dll.manifest \
+			-outputresource:$(basename $(2))$${major}.dll\;2; \
+	fi && \
+	mv $(basename $(2))$${major}.lib $(2)
 endef
 
 #                       1    2      3       4
-- 
cgit v1.2.3-54-g00ecf