From 96bc48a4e01604d62f3b95d36256c3fbd8cfc683 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Thu, 22 Oct 2009 15:42:09 +0000 Subject: [PATCH] windows install fixes git-svn-id: svn+q:///qpdf/trunk@858 71b93d88-0707-0410-a8cf-f5a4172ac649 --- make/installwin.mk | 2 +- make/mingw.mk | 1 + make/msvc.mk | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/make/installwin.mk b/make/installwin.mk index fa24a006..640205eb 100644 --- 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 index 2ef2691f..376a4a43 100644 --- 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 index 1edffb9a..763824ab 100644 --- 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