* stepmake/stepmake/topdocs-targets.make (make-txt-files): define

make-txt-files target.

* stepmake/stepmake/toplevel-targets.make (do-top-doc): use
make-txt-files target.

* configure.in (LINK_GXX_STATICALLY): $srcdir for readlink.py

diff --git a/ChangeLog b/ChangeLog
index 80c34e716e42f5272ea57419177268d73c2684bc..8682b2ceaa64ab7b35f19fe2f581fc0081a11ce9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2006-06-06  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * stepmake/stepmake/topdocs-targets.make (make-txt-files): define
+       make-txt-files target.
+
+       * stepmake/stepmake/toplevel-targets.make (do-top-doc): use
+       make-txt-files target.
+
+       * configure.in (LINK_GXX_STATICALLY): $srcdir for readlink.py
+
        * stepmake/stepmake/generic-vars.make (distdir): create dist in
        top-build-dir.
 

diff --git a/configure.in b/configure.in
index 00f3e75e5ce380fdfe71a3290a28a53209ad1681..489457146a90d9116001906651e926bb3575d993 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -73,7 +73,7 @@ else
       NCSB_FILE=`$FCMATCH --verbose "Century Schoolbook L:style=$style" | grep 'file:'`
 
       NCSB_FILE=`echo $NCSB_FILE | sed 's/^.*"\(.*\)".*$/\1/g'`
-      NCSB_FILE=`$PYTHON buildscripts/readlink.py $NCSB_FILE`
+      NCSB_FILE=`$PYTHON "$srcdir/buildscripts/readlink.py" $NCSB_FILE`
       NCSB_SOURCE_FILES="$NCSB_FILE $NCSB_SOURCE_FILES"
     done
   else

diff --git a/stepmake/stepmake/topdocs-targets.make b/stepmake/stepmake/topdocs-targets.make
index ef2115d79f1abbd87d0473c09e5a07a1739a0435..0300803f84b9685c888078f625683d1a09364816 100644 (file)
--- a/stepmake/stepmake/topdocs-targets.make
+++ b/stepmake/stepmake/topdocs-targets.make
@@ -2,3 +2,5 @@
 default: local-doc
 
 local-WWW: $(HTML_FILES) $(PDF_FILES) $(TO_TOP_FILES)
+
+make-txt-files: $(addprefix $(outdir)/,$(addsuffix .txt,$(TO_TOP_FILES)))

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index 9554110245634c3494b87b6b9617b02d5093a051..5d404ec68230ff21703cd20f866a5e1601a76548 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -29,7 +29,7 @@ $(package-icon):
 
 
 do-top-doc:
-       -$(MAKE) -C Documentation/topdocs/ README_TOP_FILES="$(README_TXT_FILES)" 
+       -$(MAKE) -C Documentation/topdocs/ TO_TOP_FILES="$(TOPDOC_FILES)" make-txt-files 
 
 
 $(README_TXT_FILES): do-top-doc