Commit 96bc48a4e01604d62f3b95d36256c3fbd8cfc683
1 parent
1426b400
windows install fixes
git-svn-id: svn+q:///qpdf/trunk@858 71b93d88-0707-0410-a8cf-f5a4172ac649
Showing
3 changed files
with
3 additions
and
1 deletions
make/installwin.mk
| @@ -6,7 +6,7 @@ installwin: all | @@ -6,7 +6,7 @@ installwin: all | ||
| 6 | mkdir $(INSTALL_DIR)/include | 6 | mkdir $(INSTALL_DIR)/include |
| 7 | mkdir $(INSTALL_DIR)/include/qpdf | 7 | mkdir $(INSTALL_DIR)/include/qpdf |
| 8 | mkdir $(INSTALL_DIR)/doc | 8 | mkdir $(INSTALL_DIR)/doc |
| 9 | - cp libqpdf/$(OUTPUT_DIR)/qpdf.lib $(INSTALL_DIR)/lib | 9 | + cp libqpdf/$(OUTPUT_DIR)/$(STATIC_LIB_NAME) $(INSTALL_DIR)/lib |
| 10 | cp libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(INSTALL_DIR)/bin | 10 | cp libqpdf/$(OUTPUT_DIR)/qpdf*.dll $(INSTALL_DIR)/bin |
| 11 | cp qpdf/$(OUTPUT_DIR)/bin/qpdf.exe $(INSTALL_DIR)/bin | 11 | cp qpdf/$(OUTPUT_DIR)/bin/qpdf.exe $(INSTALL_DIR)/bin |
| 12 | cp zlib-flate/$(OUTPUT_DIR)/bin/zlib-flate.exe $(INSTALL_DIR)/bin | 12 | cp zlib-flate/$(OUTPUT_DIR)/bin/zlib-flate.exe $(INSTALL_DIR)/bin |
make/mingw.mk
| @@ -76,6 +76,7 @@ endef | @@ -76,6 +76,7 @@ endef | ||
| 76 | # Install target | 76 | # Install target |
| 77 | 77 | ||
| 78 | INSTALL_DIR = install-mingw | 78 | INSTALL_DIR = install-mingw |
| 79 | +STATIC_LIB_NAME = libqpdf.a | ||
| 79 | include make/installwin.mk | 80 | include make/installwin.mk |
| 80 | install: installwin | 81 | install: installwin |
| 81 | strip $(INSTALL_DIR)/bin/*.exe | 82 | strip $(INSTALL_DIR)/bin/*.exe |
make/msvc.mk