[Fedora-directory-commits] coolkey configure.in, 1.12, 1.13 ltmain.sh, 1.2, 1.3

[Robert Relyea (rrelyea)]

Author: rrelyea

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

Modified Files:
	configure.in ltmain.sh 
Log Message:

make install fixes for windows



Index: configure.in
===================================================================
RCS file: /cvs/dirsec/coolkey/configure.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- configure.in	14 Feb 2007 01:42:32 -0000	1.12
+++ configure.in	16 Feb 2007 19:46:02 -0000	1.13
@@ -65,6 +65,11 @@
 	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])


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/coolkey/ltmain.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ltmain.sh	25 Aug 2006 00:31:39 -0000	1.2
+++ ltmain.sh	16 Feb 2007 19:46:02 -0000	1.3
@@ -5367,7 +5367,7 @@
 	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 @@
 	  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"