summaryrefslogtreecommitdiff
path: root/bin/minstall
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2010-07-24 12:05:34 +0100
committerBrian Paul <brianp@vmware.com>2010-09-01 08:48:06 -0600
commitc55a8a73a483305c7c9a7bcc7191dd7c833f873d (patch)
tree670a084e6c29aafd585d826735e30d09b1a9d3b9 /bin/minstall
parent36b195332fffdba6f596750266dc4a805d046b89 (diff)
Cygwin: Teach mklib/minstall to properly install libraries on cygwin
Teach mklib/minstall more about cygwin so libraries are properly installed Have mklib install the .dll into the lib/ staging directory as well Have minstall install the .dll into PREFIX/bin at the same time as installing the .dll.a link library into PREFIX/lib mklib uses a '-' rather than a '.' as the separator before the version number in library names on cygwin. Change the install globs so they match library names like that. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Signed-off-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'bin/minstall')
-rwxr-xr-xbin/minstall21
1 files changed, 20 insertions, 1 deletions
diff --git a/bin/minstall b/bin/minstall
index 130025829ba..094ec0c2b2a 100755
--- a/bin/minstall
+++ b/bin/minstall
@@ -31,7 +31,7 @@ if [ $# -ge 2 ] ; then
# Last cmd line arg is the dest dir
for FILE in $@ ; do
- DEST="$FILE"
+ DESTDIR="$FILE"
done
# Loop over args, moving them to DEST directory
@@ -42,6 +42,25 @@ if [ $# -ge 2 ] ; then
exit 0
fi
+ DEST=$DESTDIR
+
+ # On CYGWIN, because DLLs are loaded by the native Win32 loader,
+ # they are installed in the executable path. Stub libraries used
+ # only for linking are installed in the library path
+ case `uname` in
+ CYGWIN*)
+ case $FILE in
+ *.dll)
+ DEST="$DEST/../bin"
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+ *)
+ ;;
+ esac
+
PWDSAVE=`pwd`
# determine file's type