diff options
| author | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2007-02-16 19:46:07 +0000 |
|---|---|---|
| committer | rrelyea <rrelyea@fba4d07e-fe0f-4d7f-8147-e0026e666dc0> | 2007-02-16 19:46:07 +0000 |
| commit | 25a696b782b1dfea7e2a833bef03b7497c19a4d7 (patch) | |
| tree | 754c0efee3cfce7978669b1f46899ff0e44d4bb1 | |
| parent | 84c646a01a46e1ae40bfedc907816cac962a7ada (diff) | |
make install fixes for windows
git-svn-id: http://svn.fedorahosted.org/svn/coolkey/trunk@52 fba4d07e-fe0f-4d7f-8147-e0026e666dc0
| -rw-r--r-- | configure.in | 5 | ||||
| -rw-r--r-- | ltmain.sh | 4 | ||||
| -rw-r--r-- | src/coolkey/Makefile.am | 24 | ||||
| -rw-r--r-- | src/libckyapplet/Makefile.am | 5 |
4 files changed, 21 insertions, 17 deletions
diff --git a/configure.in b/configure.in index 9f35957..e73ddf5 100644 --- a/configure.in +++ b/configure.in @@ -65,6 +65,11 @@ case "$host" in CC=cl CXX=cl CXXFLAGS="$CXXFLAGS /EHsc" + # + # Sigh, prevents us from overriding it with --libdir= in the config + * line, but we can still override it in the make line. + # + libdir=`cygpath ${WINDIR}/system32` ;; *-*-darwin*) AC_MSG_RESULT([MAC]) @@ -5367,7 +5367,7 @@ relink_command=\"$relink_command\"" test "X$dir" = "X$file/" && dir= dir="$dir$objdir" - if test -n "$relink_command"; then + if test -n "$relink_command" -a "$version_type" != "windows" ; then # Determine the prefix the user has applied to our future dir. inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` @@ -5406,7 +5406,7 @@ relink_command=\"$relink_command\"" shift srcname="$realname" - test -n "$relink_command" && srcname="$realname"T + test -n "$relink_command" -a "$version_type" != "windows" && srcname="$realname"T # Install the shared library and build the symlinks. $show "$install_prog $dir/$srcname $destdir/$realname" diff --git a/src/coolkey/Makefile.am b/src/coolkey/Makefile.am index f3011df..eae2bec 100644 --- a/src/coolkey/Makefile.am +++ b/src/coolkey/Makefile.am @@ -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 @@ clean-generic: 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 diff --git a/src/libckyapplet/Makefile.am b/src/libckyapplet/Makefile.am index e1e93e4..4130839 100644 --- a/src/libckyapplet/Makefile.am +++ b/src/libckyapplet/Makefile.am @@ -60,6 +60,11 @@ noinst_HEADERS = \ install-data-hook: rm -f $(DESTDIR)$(libdir)/libckyapplet.a rm -f $(DESTDIR)$(libdir)/libckyapplet.la +if IS_WINDOWS + rm -f $(DESTDIR)$(libdir)/libckyapplet.lib +endif +if !IS_WINDOWS pcdir = $(libdir)/pkgconfig pc_DATA = libckyapplet.pc +endif |