2005-03-07 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ * make/lilypond.fedora.spec.in (Requires): scrap kpathsea/tex
+ requirements
+
* stepmake/aclocal.m4: check dynamic link, by checking if kpathsea
executable is < 40k
STEPMAKE_TEMPLATES = library c po
MODULE_CFLAGS = -std=c99
-#MODULE_LDFLAGS = $(KPATHSEA_LIBS)
include $(depth)/make/stepmake.make
MODULE_LIBS=$(depth)/flower $(depth)/ttftool $(depth)/kpath-guile
MODULE_INCLUDES= $(depth)/flower/include $(depth)/ttftool/include
MODULE_CXXFLAGS=
+MODULE_LDFLAGS = $(KPATHSEA_LIBS)
HELP2MAN_EXECS = lilypond
# LilyPond is often run from within $(outdir), making a relative
# PREFIX incorrect.
-export LILYPONDPREFIX:=$(build_lilypond_datadir)
+export LILYPONDPREFIX:=$(build_lilypond_datadir)/$(TOPLEVEL_VERSION)
export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
Buildrequires: fontforge
#fontforge must be >= 20041211 urg. 0.0.0-fdr.1.20041211
-Requires: tetex tetex-latex libstdc++ python tetex-dvips tetex-latex
+Requires: libstdc++ python
Requires: guile >= 1.6.4-8 ghostscript >= 8.15
%description
# In fact, do not take out the spaces between % and { in the above comment,
# because RPM will gladly do a substitution anyway.
-./configure --disable-checking --prefix=%{_prefix} --enable-optimising
+./configure --without-kpathsea --disable-checking --prefix=%{_prefix} --enable-optimising
make all
if test "$have_libkpathsea_so" = "maybe"; then
if test $shared_size -lt 40000 ; then
have_libkpathsea_so=yes
+ else
+ have_libkpathsea_so=no
fi
fi
if test "$kpathsea_b" != no; then
AC_MSG_RESULT(yes)
KPATHSEA=1
+ if "$have_libkpathsea_so" = "no" ; then
+ KPATHSEA_LIBS="-lkpathsea"
+ fi
else
AC_MSG_RESULT(no)
KPATHSEA=0