Merge remote branch 'origin/master' into nv50-compiler

[mesa.git] / bin / minstall

diff --git a/bin/minstall b/bin/minstall
index 8ee96089fa618d7d98866f5bb59420294501eb6b..094ec0c2b2af7f675db1f23e8efdffaf0e23de37 100755 (executable)
--- 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
@@ -66,8 +85,11 @@ if [ $# -ge 2 ] ; then
 
                elif [ -f "$FILE" ] ; then
                        #echo "$FILE" is a regular file
-                       $RM "$DEST/`basename $FILE`"
-                       cp "$FILE" "$DEST"
+                       # Only copy if the files differ
+                       if ! cmp -s $FILE $DEST/`basename $FILE`; then
+                               $RM "$DEST/`basename $FILE`"
+                               cp "$FILE" "$DEST"
+                       fi
                        if [ $MODE ] ; then
                                FILE=`basename "$FILE"`
                                chmod $MODE "$DEST/$FILE"