X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=toolbox;h=32519a19ad478d1be46ae1de055b460bd1507a1c;hb=19933fe7a674ee6d1253821a656507a6a712f8d0;hp=cdac5ed62c4d1dc7d2d2e603b17596236db8af93;hpb=5438a92a0681c6e96f3b591a1a3b89dbdb899320;p=vlc

diff --git a/toolbox b/toolbox
index cdac5ed62c..32519a19ad 100755
--- a/toolbox
+++ b/toolbox
@@ -194,6 +194,10 @@ then
     cat > "$file.$$.bak" << EOF
 /* This file was created automatically by glade2 and fixed by bootstrap */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 EOF
     sed -e 1,7d \
@@ -217,10 +221,10 @@ if test "${action}" = "distclean"
 then
   set -x
   # a naive sanity check to make sure we are in a VLC tree
-  test -f vlc.mandriva.spec -a -f vlc.win32.nsi.in || exit 1
+  test -f vlc-config.in.in -a -f src/libvlc.c || exit 1
   # let's rock!
   find . -false -path './extras/contrib/*' -type f '(' -name '*.[oa]' -o -name '*.l[oa]' -o -name '*.so' -o -name '*.sl' -o -name '*.dylib' -o -name '*.dll' -o -name .dirstamp -o '(' '(' ! -path '\./doc/developer/Makefile\.in' ')' -a -name Makefile.in ')' -o -name 'stamp-h*' -o -name '*~' -o -name '*.bak' -o -name '*.moc.cpp' ')' -exec rm -f '{}' ';'
-  (cd autotools && find . -maxdepth 1 -name '[a-z]*' -exec rm -f '{}' ';')
+  (cd autotools && find . -maxdepth 1 -name '[a-z]*' -not -name 'config.rpath' -exec rm -f '{}' ';')
   find . -type d -name '.deps' -exec rm -Rf '{}' ';'
   find . -type d -name '.libs' -exec rm -Rf '{}' ';'
   # there's some more cruft all around
@@ -262,5 +266,10 @@ then
     mkdir "${distdir}/extras/contrib/src/Patches"
   fi
   cp ${srcdir}/extras/contrib/src/Patches/* "${distdir}/extras/contrib/src/Patches/"
+  if test ! -d "${distdir}/extras/contrib/src/Distributions"
+  then
+    mkdir "${distdir}/extras/contrib/src/Distributions"
+  fi
+  cp ${srcdir}/extras/contrib/src/Distributions/* "${distdir}/extras/contrib/src/Distributions/"
 fi