[Fedora-directory-commits] coolkey/src/coolkey Makefile.am, 1.8, 1.9 Makefile.in, 1.11, 1.12

Robert Relyea (rrelyea) fedora-directory-commits at redhat.com
Sat Feb 17 01:20:33 UTC 2007


Author: rrelyea

Update of /cvs/dirsec/coolkey/src/coolkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29110/src/coolkey

Modified Files:
	Makefile.am Makefile.in 
Log Message:


Match the distribution location of zlib1.dll when installing it.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am	16 Feb 2007 23:04:51 -0000	1.8
+++ Makefile.am	17 Feb 2007 01:20:31 -0000	1.9
@@ -76,7 +76,7 @@
 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
 
 


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile.in	16 Feb 2007 23:04:51 -0000	1.11
+++ Makefile.in	17 Feb 2007 01:20:31 -0000	1.12
@@ -729,7 +729,7 @@
 	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
- at IS_WINDOWS_TRUE@	cp $(ZLIB_LIB)/zlib1.dll $(DESTDIR)/$(libdir)/zlib1.dll
+ at 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:




More information about the Fedora-directory-commits mailing list