use %make and %makeinstall

diff --git a/ChangeLog b/ChangeLog
index 76bb651b58b3f5af842ae7b0377df4f8bca5cb10..78990d0afa5b4601904fe969964d7c4c6e136a07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-02  Heikki Junes <hjunes@cc.hut.fi>
+
+       * make/lilypond.mandrake.spec.in: use %make and %makeinstall.
+
 2002-12-01  Heikki Junes <hjunes@cc.hut.fi>
 
        * make/lilypond.mandrake.spec.in: set menu-items to lilypond-info 

diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in
index 3f2c36d06aacab024fa8f7e464a907d4f14430a7..3e53c8213563dce4e8cd60d6b9d8d73072e4bb5f 100644 (file)
--- a/make/lilypond.mandrake.spec.in
+++ b/make/lilypond.mandrake.spec.in
@@ -51,7 +51,7 @@ rm -rf $RPM_BUILD_ROOT
 ##./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimising --enable-shared
 ## Add options if needed
 ./configure --disable-checking --prefix=%{_prefix} --enable-optimising
-make MAKE_PFA_FILES=1 all
+%make MAKE_PFA_FILES=1 all
 
 # make info
 make -C Documentation
@@ -68,7 +68,7 @@ rm -rf $RPM_DOC_ROOT
 mkdir -p $RPM_DOC_ROOT
 
 strip lily/out/lilypond 
-make prefix="$RPM_BUILD_ROOT%{_prefix}" infodir="$RPM_BUILD_ROOT%{_infodir}" MAKE_PFA_FILES=1 mandir="$RPM_BUILD_ROOT%{_mandir}" install
+%makeinstall MAKE_PFA_FILES=1
 
 %if %{info}
   rm -f $RPM_BUILD_ROOT/%{_infodir}/dir