]> git.sesse.net Git - vlc/commitdiff
* ./toolbox: the Solaris diff does not understand -q, just replaced it
authorSam Hocevar <sam@videolan.org>
Mon, 14 Apr 2003 23:10:20 +0000 (23:10 +0000)
committerSam Hocevar <sam@videolan.org>
Mon, 14 Apr 2003 23:10:20 +0000 (23:10 +0000)
    with 2>&1 >/dev/null.

toolbox

diff --git a/toolbox b/toolbox
index 73aa41f5bc5395f2e483b49fa06e2d1ba2df3702..4e6c19efa812dda80c2d7958fea626343899c682 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.22 2003/04/14 23:07:38 sam Exp $
+##  $Id: toolbox,v 1.23 2003/04/14 23:10:20 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -359,7 +359,7 @@ then
   echo '#ifdef __PLUGIN__' >> ${file}.in
   cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/#   define \2 p_symbols->\2_inner/' >> ${file}.in
   echo '#endif /* __PLUGIN__ */' >> ${file}.in
-  if diff -q ${file} ${file}.in
+  if diff 2>&1 >/dev/null ${file} ${file}.in
   then
     rm -f ${file}.in
   else
@@ -373,7 +373,7 @@ then
   echo '#define STORE_SYMBOLS( p_symbols ) \' >> ${file}.tmp
   cat ${LIBVLC_HEADERS} | grep '^ *VLC_EXPORT.*;' | sed -e 's/VLC_EXPORT( *\([^,]*\), *\([^,]*\), *\(.*\));.*/    (p_symbols)->\2_inner = \2; \\/' >> ${file}.tmp
   echo '' >> ${file}.tmp
-  if diff -q ${file} ${file}.tmp
+  if diff 2>&1 >/dev/null ${file} ${file}.tmp
   then
     rm -f ${file}.tmp
   else
@@ -403,7 +403,7 @@ then
   fi
   echo "    } while( 0 );" >> ${file}.tmp
   echo "" >> ${file}.tmp
-  if diff -q ${file} ${file}.tmp
+  if diff 2>&1 >/dev/null ${file} ${file}.tmp
   then
     rm -f ${file}.tmp
   else