(local-install-info): Invoke

install-info --remove first.

diff --git a/ChangeLog b/ChangeLog
index 31ba5e63dac2d3c8c12db1a23cc3193e15a9c12d..8c3ab1b89a633f8fc1214d0b991785a941735931 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-18  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * Documentation/user/GNUmakefile (local-install-info): Invoke
+       install-info --remove first.
+
 2004-11-17  Werner Lemberg  <wl@gnu.org>
 
        * python/lilylib.py (options_help_str): Support pretty-printing of

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index b342ffa3f290ba6853ffe08a236d2ea648cacf31..d88c5eb21133477fcf2a7aa4c747345b87214d60 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -67,6 +67,7 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
 else
 
        -$(INSTALL) -d $(DESTDIR)$(package_infodir)
+       -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info
        install-info --info-dir=$(infodir) $(outdir)/lilypond.info
        (cd $(package_infodir) && ln -sf $(local_package_docdir)/Documentation/user/out-www/*png .)
 endif
@@ -99,6 +100,7 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
        @echo
 else
        -$(INSTALL) -d $(DESTDIR)$(package_infodir)
+       -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info
        install-info --info-dir=$(infodir) $(outdir)/lilypond.info
        @echo
        @echo "***************************************************************"

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 01f6f3d2e67be75de65e4fec57519251717b5f09..d7143f5607082eac72e668e1c58d74923a725337 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -21,7 +21,7 @@ SLIB_PATH=`locate slib/require.scm | head -1 | sed -s 's/require.scm//g'`
 
 # What extra modules to pull (eg: EXTRA="libgnomecanvas libwnck")
 EXTRA=${EXTRA-libgnomecanvas}
-GGVERSION=2.7.96
+GGVERSION=2.7.95
 GWRAPVERSION=1.9.3
 
 download=$HOME/usr/src/releases
@@ -77,7 +77,7 @@ if ! pkg-config --atleast-version=1.5.1 pango; then
        ./autogen.sh --help
     fi
     ./configure --prefix=$OPT/pango --enable-maintainer-mode --enable-gtk-doc
-    make XFT_LIBS="-L/usr/lib -lXft -L/usr/X11R6/lib -lfreetype -lz -lXrender -lX11 -lfontconfig" install
+    make XFT_LIBS="-L/usr/lib -lXft -L/usr/X11R6/lib -lfreetype -lz -lXrender -lX11 -lfontconfig" all install
     cd ../..
 fi
 
@@ -202,7 +202,7 @@ if ! pkg-config --atleast-version=$GGVERSION guile-gnome-glib; then
     # or use gcc-3.4 with libtool-1.6.0
        CC=$GCC34 ../src/configure --prefix=$OPT/guile-gnome --enable-maintainer-mode
     fi
-    make install G_WRAP_MODULE_DIR=$OPT/g-wrap/share/guile/site
+    make all install G_WRAP_MODULE_DIR=$OPT/g-wrap/share/guile/site
 fi
 
 # simple test -- fails atm

diff --git a/config.hh.in b/config.hh.in
index 2219f8462708d709ffd718f577664f77bf32cfe8..6dcc94c183f424d95b027312a6c807593176ea77 100644 (file)
--- a/config.hh.in
+++ b/config.hh.in
@@ -73,8 +73,8 @@
 /* define if you have sstream */
 #define HAVE_SSTREAM 0
 
-/* define if you have pango CVS */
-#define HAVE_PANGO_CVS 0
+/* define if you have pango 1.6 */
+#define HAVE_PANGO16 0
 
 /* define if you have pango_fc_font_map_add_decoder_find_func */
 #define HAVE_PANGO_FC_FONT_MAP_ADD_DECODER_FIND_FUNC 0

diff --git a/configure.in b/configure.in
index e2aa933081f9bbf8db9737994b6116cd0c3c5b08..43badca3cdc0a8612d0d1ca09f6434058a618e5d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -88,8 +88,8 @@ PKG_CONFIG_PATH=$HOME/usr/pkg/pango/lib/pkgconfig:$PKG_CONFIG_PATH
 
 #STEPMAKE_FREETYPE2
 if test "$gui_b" = "yes"; then
-  STEPMAKE_GTK2
-  STEPMAKE_PANGO
+    STEPMAKE_GTK2
+    STEPMAKE_PANGO
 fi
 
 ## Optional tools for building documentation, website, extra fonts.

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index bc0979e1799916cfa05750a400dfc678634cbb3b..0eb5ed6ce1b5611908108cf1a485b5100bfa762c 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1103,9 +1103,9 @@ AC_DEFUN(STEPMAKE_GTK2, [
 ])
 
 AC_DEFUN(STEPMAKE_PANGO, [
-    PKG_CHECK_MODULES(PANGO, pango >= 1.5.0, have_pango_cvs=true, true)
-    if $have_pango_cvs ; then
-       AC_DEFINE(HAVE_PANGO_CVS)
+    PKG_CHECK_MODULES(PANGO, pango >= 1.6.0, have_pango16=true, true)
+    if $have_pango16 ; then
+       AC_DEFINE(HAVE_PANGO16)
        PANGO_CFLAGS="$PANGO_CFLAGS $GTK2_CFLAGS"
        PANGO_LIBS="$PANGO_LIBS $GTK2_LIBS"
        CPPFLAGS="$PANGO_CFLAGS $CPPFLAGS"