[Fedora-directory-commits] coolkey/src/coolkey Makefile.am,1.6,1.7

[Robert Relyea (rrelyea)]

Author: rrelyea

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

Modified Files:
	Makefile.am 
Log Message:

make install fixes for windows



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/coolkey/src/coolkey/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile.am	14 Feb 2007 00:46:28 -0000	1.6
+++ Makefile.am	16 Feb 2007 19:46:02 -0000	1.7
@@ -22,7 +22,11 @@
 SUBDIRS = 
 AM_CPP_FLAGS =
 EXTRA_DIST = coolkeypk11.def
+if IS_WINDOWS
+pkcs11dir = $(libdir)
+else
 pkcs11dir = $(libdir)/pkcs11
+endif
 pkcs11_LTLIBRARIES = libcoolkeypk11.la
 
 libcoolkeypk11_la_SOURCES = \
@@ -69,20 +73,10 @@
 install-data-hook:
 	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.a
 	rm -f $(DESTDIR)$(pkcs11dir)/libcoolkeypk11.la
+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
+endif
 
 
-#MODULE = coolkeypk11
-#REQUIRES = ckyapplet zlib
-#USE_STATIC_RTL=1
-
-#BASE_LIBRARY_NAME = coolkeypk11
-#LIBRARY_NAME = $(BASE_LIBRARY_NAME)
-#MAPFILE = $(OBJDIR)/coolkeypk11.def
-
-#DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" \
-# -DPKCS11_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
-
-#DEFINES += -DNSS_HIDE_NONSTANDARD_OBJECTS=1
-
-#pcdir = $(libdir)/pkgconfig
-#pc_DATA = libcoolkey.pc