distribution fixes

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 293af2d3de11f9416cb03755ed7dd86bf25a233d..16f7437bc93f872191f162fffe0badc4bfd2ec13 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -83,3 +83,5 @@ check-completions: disorder
        diff -u ,commands ,completions
 
 CLEANFILES=,commands ,completions
+
+EXTRA_DIST=dump2wav

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 81d022f55b20668ecb7ce4b511b46f75c3540453..fd3a35bbcf25407dd241f4df9e228bd67aaf3088 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -21,4 +21,4 @@
 dist_pkgdata_DATA=completion.bash
 
 EXTRA_DIST=htmlman sedfiles.make text2c oggrename make-unidata \
-       format-gcov-report
+       format-gcov-report make-version-string

diff --git a/scripts/dist b/scripts/dist
index 1855aa88553f8a9d19fa0197e9947f696d20a80f..ec523a49e0c88804f3a56882a6ccbaebd3840c52 100755 (executable)
--- a/scripts/dist
+++ b/scripts/dist
@@ -29,11 +29,12 @@ cp $d.tar.bz2 $HOME/work/web/disorder
 cp CHANGES $HOME/work/web/disorder/CHANGES.txt
 cp README $HOME/work/web/disorder/README.txt
 cp ChangeLog.d/*--* $HOME/work/web/disorder/ChangeLog.d
+bzr log > $HOME/work/web/disorder/ChangeLog.d/bzr-changelog.txt
 cd doc
 for f in *.[1-9].html; do
   echo $f
   rm -f $HOME/work/web/disorder/$f
   sed < $f > $HOME/work/web/disorder/$f 's/^@.*//'
 done
-cp doc/plumbing.svg $HOME/work/web/disorder
-cp doc/plumbing.png $HOME/work/web/disorder
+cp plumbing.svg $HOME/work/web/disorder
+cp plumbing.png $HOME/work/web/disorder