diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/topdocs-targets.make | 2 | ||||
| -rw-r--r-- | stepmake/stepmake/toplevel-targets.make | 2 |
4 files changed, 12 insertions, 2 deletions
@@ -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 00f3e75e5c..489457146a 100644 --- 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 ef2115d79f..0300803f84 100644 --- 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 9554110245..5d404ec682 100644 --- 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 |