* Makefile.am:

[vlc] / toolbox

diff --git a/toolbox b/toolbox
index b49daa4558e2bd30ddf69e819ead8a54f10145b8..26e2db7f7d73bef80f1f9e6d260ecb892ebf2235 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.29 2003/06/28 01:17:47 sam Exp $
+##  $Id: toolbox,v 1.30 2003/06/28 13:04:52 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -37,9 +37,10 @@ EOF
 ##
 getfiles()
 {
-  awk 'BEGIN{a=0}{if(!a&&/^'"$1"'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < Makefile.am | \
+  awk 'BEGIN{a=0}{if(!a&&/^'"$1"'[^-_a-zA-Z0-9]*=/){a=1;print$0;next;}if(a){if(/^[a-zA-Z]/){exit;}print $0}}' < "${srcdir}/Makefile.am" | \
     tr '\\ ' '\n\n' | \
-    sed -ne 's/[^-$()_a-zA-Z0-9][^-$()_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p'
+    sed -ne 's/[^-$()_a-zA-Z0-9][^-$()_a-zA-Z0-9]*\([a-zA-Z]\)/\1/p' | \
+    sed -e "s,^,${srcdir}/,"
 }
 
 ###
@@ -115,6 +116,8 @@ if test "${action}" = "vc"
 then
   echo "generating Visual Studio files..."
 
+  srcdir="`sed -ne 's/^srcdir *= *//p;T;q' < Makefile`"
+
   #  The evil ^M
   M="`printf '\r'`"
 
@@ -364,10 +367,11 @@ if test "${action}" = "includes"
 then
   #set -x
 
+  srcdir="`sed -ne 's/^srcdir *= *//p;T;q' < Makefile`"
   LIBVLC_HEADERS=`getfiles HEADERS_include`
   BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' vlc-config`
 
-  file=include/vlc_symbols.h
+  file="${srcdir}/include/vlc_symbols.h"
 
   rm -f ${file}.in
   echo '/* DO NOT EDIT THIS FILE! See Makefile.am */' >> ${file}.in
@@ -385,7 +389,7 @@ then
     mv -f ${file}.in ${file}
   fi
 
-  file=src/misc/modules_plugin.h
+  file="${srcdir}/src/misc/modules_plugin.h"
 
   rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
   sed -e 's#.*\$[I][d]:.*# * Automatically generated from '${file}'.in by bootstrap#' < ${file}.in > ${file}.tmp
@@ -400,7 +404,7 @@ then
     mv -f ${file}.tmp ${file}
   fi
 
-  file=src/misc/modules_builtin.h
+  file="${srcdir}/src/misc/modules_builtin.h"
 
   rm -f ${file}.tmp && cp ${file}.in ${file}.tmp
   if test "${BUILTINS}" != ""