From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 7 Mar 2005 00:44:46 +0000 (+0000)
Subject: * make/lilypond.fedora.spec.in (Requires): scrap kpathsea/tex
X-Git-Tag: release/2.5.14~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=36f6766b9de37adb09d2a27e3f925b356cbc0849;p=lilypond.git

* make/lilypond.fedora.spec.in (Requires): scrap kpathsea/tex
requirements

* stepmake/aclocal.m4: check dynamic link, by checking if kpathsea
executable is < 40k
---

diff --git a/ChangeLog b/ChangeLog
index 2714a9ba42..e5540203ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 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
 
diff --git a/kpath-guile/GNUmakefile b/kpath-guile/GNUmakefile
index eec5e650c3..b10a6dc6a0 100644
--- a/kpath-guile/GNUmakefile
+++ b/kpath-guile/GNUmakefile
@@ -7,7 +7,6 @@ SCRIPTS =
 STEPMAKE_TEMPLATES = library c po
 
 MODULE_CFLAGS = -std=c99
-#MODULE_LDFLAGS = $(KPATHSEA_LIBS)
 
 include $(depth)/make/stepmake.make 
 
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 8070b6ad40..651cc6d4ac 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -7,6 +7,7 @@ SUBDIRS = include
 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
diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 138c1f03ab..d9946a8914 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -6,7 +6,7 @@ export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfb
 
 # 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)
 
diff --git a/make/lilypond.fedora.spec.in b/make/lilypond.fedora.spec.in
index 6df1069fbc..f77d79a2d1 100644
--- a/make/lilypond.fedora.spec.in
+++ b/make/lilypond.fedora.spec.in
@@ -21,7 +21,7 @@ Buildrequires: freetype-devel >= 2.1
 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
@@ -48,7 +48,7 @@ Documentation and example files of LilyPond. An index is available at
 # 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
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index c87968c4e2..07bb56d3b9 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -803,6 +803,8 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
     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
     
@@ -818,6 +820,9 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
     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