aboutsummaryrefslogtreecommitdiffstats
path: root/make/mingw.mk
diff options
context:
space:
mode:
authorJay Berkenbilt <ejb@ql.org>2010-08-09 00:29:49 +0200
committerJay Berkenbilt <ejb@ql.org>2010-08-09 00:29:49 +0200
commitb282fd818d7c1144cbc169445a799d0b9d46fa1a (patch)
tree755e0709a71f5b17151066630fa698d322f26e85 /make/mingw.mk
parentbc91aa29453b6bbb822f2bfb39bae88b1db41a31 (diff)
downloadqpdf-b282fd818d7c1144cbc169445a799d0b9d46fa1a.tar.zst
further tweaking of dll creation to deal with msys shell issues
git-svn-id: svn+q:///qpdf/trunk@1008 71b93d88-0707-0410-a8cf-f5a4172ac649
Diffstat (limited to 'make/mingw.mk')
-rw-r--r--make/mingw.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/make/mingw.mk b/make/mingw.mk
index 9ee66aa0..e6d06f5f 100644
--- a/make/mingw.mk
+++ b/make/mingw.mk
@@ -62,9 +62,8 @@ endef
# 1 2 3 4 5 6 7
# Usage: $(call makelib,objs,library,ldflags,libs,current,revision,age)
define makelib
- major=$$(( $(5) - $(7) )); \
- dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`)$${major}.dll $(1) && \
- $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$${major}.dll \
+ dlltool -l $(2) -D $$(basename `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll) $(1); \
+ $(CXX) -shared -o `echo $(2) | sed -e 's,/lib\(.*\).a,/\1,'`$(shell expr $(5) - $(7)).dll \
$(1) $(3) $(4)
endef