From: hanwen Date: Thu, 25 Sep 2003 12:47:42 +0000 (+0000) Subject: move site-start back to /usr/share. X-Git-Tag: release/2.1.3~67 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5f4b3c9c4e7abc13157c2a79b339adffe82a8170;p=lilypond.git move site-start back to /usr/share. --- diff --git a/ChangeLog b/ChangeLog index 29cd7463e7..e3275d7817 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2003-09-25 Han-Wen Nienhuys + * make/lilypond.redhat.spec.in: move site-start back to /usr/share. + * lily/script-engraver.cc (make_script_from_event): don't crash on non-string articulation-type. diff --git a/VERSION b/VERSION index 75b15c6fed..c52f6f1930 100644 --- a/VERSION +++ b/VERSION @@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=0 PATCH_LEVEL=0 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=hwn1 diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index a256a3d83e..1f99b6f966 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -71,8 +71,8 @@ gzip -9fn $RPM_BUILD_ROOT%{_infodir}/* %endif mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d -install -m 755 -d $RPM_BUILD_ROOT/etc/emacs/site-start.d -install -m 644 elisp/lilypond-init.el $RPM_BUILD_ROOT/etc/emacs/site-start.d +# install -m 755 -d $RPM_BUILD_ROOT/etc/emacs/site-start.d +install -m 644 elisp/lilypond-init.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d gzip -9fn $RPM_BUILD_ROOT%{_mandir}/man1/* @@ -119,7 +119,7 @@ scrollkeeper-update %files %defattr(-, root, root) %{_datadir}/emacs/site-lisp/lilypond* -/etc/emacs/site-start.d/lilypond-* +%{_datadir}/emacs/site-lisp/site-start.d/lilypond* %{_bindir}/abc2ly %{_bindir}/as2text