]> git.donarmstrong.com Git - lilypond.git/commitdiff
projects / lilypond.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2133a78)
*** empty log message ***
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Wed, 3 May 2006 20:30:59 +0000 (20:30 +0000)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Wed, 3 May 2006 20:30:59 +0000 (20:30 +0000)
ChangeLog patch | blob | history
input/tutorial/lbook-html-test.html patch | blob | history
stepmake/aclocal.m4 patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index b915dd46ae44bf252750457072b69db948dc356a..a723aaf3b23c9b21639c00d05948ea29fd1b50fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
 
 2006-05-03  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
+       * stepmake/aclocal.m4: run python-config for crosscompiling flags.
+
        * scripts/lilypond-book.py (Lilypond_file_snippet.my_system): add
        -f png for HTML, TEXINFO formats.
 
diff --git a/input/tutorial/lbook-html-test.html b/input/tutorial/lbook-html-test.html
index a55d74d8f956be3f7534ad28a133c5a9ea4b6476..0a64062447dc57042d5df60e28dcab5e92d34b1b 100644 (file)
--- a/input/tutorial/lbook-html-test.html
+++ b/input/tutorial/lbook-html-test.html
@@ -1,4 +1,7 @@
-<html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!-- header_tag -->
+<HTML>
+
 <p>
 Documents for lilypond-book may freely mix music and text.  For
 example,
@@ -11,4 +14,21 @@ example,
 <lilypond fragment quote staffsize=26 verbatim>
   c'4 f16
 </lilypond>
-</html>
+<!-- footer_tag -->
+<div style="background-color: #e8ffe8; padding: 2; border: #c0ffc0 1px solid;">
+
+<p>
+<font size="-1">
+This page is for LilyPond-2.9.3 (development-branch). <br>
+</font>
+<address><font size="-1">
+Report errors to <a href="http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs">http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs</a>.</font></address>
+</p>
+</div>
+
+<P>
+ Other languages: <a href="lbook-html-test.html">English</a>.
+ <BR>
+ Using <A HREF='/web/about/browser-language'>automatic language selection</A>.
+</P>
+</HTML>
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 3718904ceb752f6194c9e4d743167a2dc09c9671..3ae4f92df6f0e8299848ee76a54166bb4f78dcdd 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1027,6 +1027,11 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
        changequote([, ])#dnl
     fi
     
+    if test "$cross_compiling" = "yes" -a -z "$PYTHON_CFLAGS"; then
+       PYTHON_CFLAGS=`python-config --cflags`
+       PYTHON_LDFLAGS=`python-config --ldflags`
+    fi
+    
     if test -z "$PYTHON_HEADER"; then
        CPPFLAGS="$PYTHON_CFLAGS $CPPFLAGS"
        AC_CHECK_HEADERS([Python.h],[PYTHON_HEADER=yes])
@@ -1038,6 +1043,8 @@ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
     fi
 ])
 
+
+
 AC_DEFUN(STEPMAKE_STL_DATA_METHOD, [
     AC_LANG_PUSH(C++)
     AC_CACHE_CHECK([for stl.data () method],
Debian packaging of lilypond