windows install fixes

git-svn-id: svn+q:///qpdf/trunk@858 71b93d88-0707-0410-a8cf-f5a4172ac649
semtle · Oct 22, 2009 · 96bc48a · 96bc48a
1 parent 1426b40
commit 96bc48a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/make/installwin.mk b/make/installwin.mk
@@ -6,7 +6,7 @@ installwin: all
 	mkdir $(INSTALL_DIR)/include
 	mkdir $(INSTALL_DIR)/include/qpdf
 	mkdir $(INSTALL_DIR)/doc
-	cp libqpdf/$(OUTPUT_DIR)/qpdf.lib $(INSTALL_DIR)/lib
+	cp libqpdf/$(OUTPUT_DIR)/$(STATIC_LIB_NAME) $(INSTALL_DIR)/lib
 	cp libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(INSTALL_DIR)/bin
 	cp qpdf/$(OUTPUT_DIR)/bin/qpdf.exe $(INSTALL_DIR)/bin
 	cp zlib-flate/$(OUTPUT_DIR)/bin/zlib-flate.exe $(INSTALL_DIR)/bin

diff --git a/make/mingw.mk b/make/mingw.mk
@@ -76,6 +76,7 @@ endef
 # Install target
 
 INSTALL_DIR = install-mingw
+STATIC_LIB_NAME = libqpdf.a
 include make/installwin.mk
 install: installwin
 	strip $(INSTALL_DIR)/bin/*.exe

diff --git a/make/msvc.mk b/make/msvc.mk
@@ -92,5 +92,6 @@ endef
 # Install target
 
 INSTALL_DIR = install-msvc
+STATIC_LIB_NAME = qpdf.lib
 include make/installwin.mk
 install: installwin