patch::: 1.1.0.uu2.jcn1: fixjes

[lilypond.git] / make / lilypond.spec.in

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index 4f47dcb672c4b3731fca470fb9b7277608b52f79..ed8060fcfa5f73e6f67a094f2f9c1a8f9d523c87 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -17,9 +17,9 @@ Prereq: tetex
 %prep
 %setup
 %build
-./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --enable-optimise --enable-shared --enable-tex-dir='${prefix}/lib/texmf/texmf/tex/generic' --enable-mf-dir='${prefix}/lib/texmf/texmf/fonts/source/'
+./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --disable-optimise --enable-shared
 make all
-make -C Documentation texinfo || true
+make -C Documentation info || true
 make htmldoc
 
 %install
@@ -29,6 +29,11 @@ tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz
 
 strip lily/out/lilypond mi2mu/out/mi2mu
 make prefix="$RPM_BUILD_ROOT/usr" install
+
+mkdir -p $RPM_BUILD_ROOT/etc/profile.d
+cp bin/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh
+cp bin/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
+
 %files
 
 %doc /tmp/lilypond-rpm-doc
@@ -40,8 +45,6 @@ make prefix="$RPM_BUILD_ROOT/usr" install
 # %doc input/*.ly
 # verbatim include of input: list the directory without issuing a %dir 
 
-%doc input
-
 /usr/bin/convert-mudela
 /usr/bin/mudela-book
 /usr/bin/ly2dvi
@@ -52,14 +55,12 @@ make prefix="$RPM_BUILD_ROOT/usr" install
 /usr/man/man1/mudela-book.1
 /usr/man/man1/ly2dvi.1
 /usr/man/man1/convert-mudela.1
-/usr/info/lilypond.info*
-/usr/lib/texmf/texmf/tex/generic/lilypond
-/usr/lib/texmf/texmf/fonts/source/public/lilypond
 /usr/share/lilypond/
 /usr/share/locale/*/LC_MESSAGES/lilypond.mo
+/etc/profile.d/lilypond.*
+
+
 %post
 
-## ln -s  /usr/lib/texmf/texmf/tex/lilypond  /usr/lib/texmf/texmf/tex/latex/lilypond # suck me plenty
-texhash                # takes some time...
 touch /tmp/.lilypond-install
 rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install