move site-start back to /usr/share.

diff --git a/ChangeLog b/ChangeLog
index 29cd7463e70b8ffee85e3741fed9863b60ccacea..e3275d78174accd7a45f949ed5903b28014478f3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-09-25  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * 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 75b15c6fed6b9b933dd746cf22b7b2201d9c4faa..c52f6f19308b12432e60ce0b136a361bb2d6e10d 100644 (file)
--- 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 a256a3d83e6a94f9ace2e064b1eedd12b159c6a2..1f99b6f966319e422fa50ddb7057c7d4e8042471 100644 (file)
--- 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