diff options
| author | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2007-02-17 01:20:31 +0000 |
|---|---|---|
| committer | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2007-02-17 01:20:31 +0000 |
| commit | 6a007181d5afd156a129f5a4801874def91754d2 (patch) | |
| tree | a9c18f87bff1d117006f9c584c9f1f3ab1a4d10f | |
| parent | c2e765faca6c21b1643b203efb0e92c0520f6fb2 (diff) | |
Match the distribution location of zlib1.dll when installing it.
git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@58 fba4d07e-fe0f-4d7f-8147-e0026e666dc0
| -rw-r--r-- | src/coolkey/Makefile.am | 2 | ||||
| -rw-r--r-- | src/coolkey/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/coolkey/Makefile.am b/src/coolkey/Makefile.am index e465329..4d5b6fe 100644 --- a/src/coolkey/Makefile.am +++ b/src/coolkey/Makefile.am @@ -76,7 +76,7 @@ install-data-hook: if IS_WINDOWS rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.lib mv $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.dll $(DESTDIR)$(pkcs11dir)/coolkeypk11.dll - cp $(ZLIB_LIB)/zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll + cp $(ZLIB_LIB)/../zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll endif diff --git a/src/coolkey/Makefile.in b/src/coolkey/Makefile.in index 6ea1751..3d6396d 100644 --- a/src/coolkey/Makefile.in +++ b/src/coolkey/Makefile.in @@ -729,7 +729,7 @@ install-data-hook: rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la @IS_WINDOWS_TRUE@ rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.lib @IS_WINDOWS_TRUE@ mv $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.dll $(DESTDIR)$(pkcs11dir)/coolkeypk11.dll -@IS_WINDOWS_TRUE@ cp $(ZLIB_LIB)/zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll +@IS_WINDOWS_TRUE@ cp $(ZLIB_LIB)/../zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: |