release: 1.1.15

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

diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in
index ed8060fcfa5f73e6f67a094f2f9c1a8f9d523c87..3c0213304a27b8828cb8d2f9c75c0b331d967aad 100644 (file)
--- a/make/lilypond.spec.in
+++ b/make/lilypond.spec.in
@@ -7,7 +7,7 @@ Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-@TOPLEVEL_VERSION@.
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>
-Icon: @package@-icon.gif
+# Icon: @package@-icon.gif
 BuildRoot: /tmp/lilypond-install
 Prereq: tetex
 
@@ -20,23 +20,25 @@ Prereq: tetex
 ./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --disable-optimise --enable-shared
 make all
 make -C Documentation info || true
-make htmldoc
+make htmldoc || true
 
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
-tar -C $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc -xzf out/htmldoc.tar.gz
+mkdir htmldocs
+tar -C htmldocs -xzf out/htmldoc.tar.gz
+#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
+cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh
+cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
 
 %files
 
-%doc /tmp/lilypond-rpm-doc
+%doc htmldocs/
 
 # hairy to hook it in (possibly non-existing) emacs
 %doc mudela-mode.el