install-info --remove first.
+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
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
@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 "***************************************************************"
# 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
./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
# 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
/* 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
#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.
])
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"