- second part of small fixes inspired by kloczek (this time better checked,

  I hope...)

Changed files:
    diffuse.spec -> 1.6

diff --git a/diffuse.spec b/diffuse.spec
index 5bbe59278bec88e3565be2c5901a4d5dd653d3f5..3d06d242699962d7b84b474dd35c84a38d06abb5 100644 (file)
--- a/diffuse.spec
+++ b/diffuse.spec
@@ -56,13 +56,14 @@ narz
 %patch0 -p1
 
 %build
-cd discus/prog
-%{__make} CFLAGS="-DREADLINE %{rpmcflags}"
-cd ../../kuplot/prog
-%{__make} CFLAGS="-DREADLINE %{rpmcflags}"
-cd ../../pdffit/prog
-%{__make} CFLAGS="-DREADLINE %{rpmcflags}"
-cd ../tools
+%{__make} -C discus/prog \
+       CFLAGS="-DREADLINE %{rpmcflags}"
+%{__make} -C kuplot/prog \
+       CFLAGS="-DREADLINE %{rpmcflags}"
+%{__make} -C pdffit/prog \
+       CFLAGS="-DREADLINE %{rpmcflags}"
+
+cd pdffit/tools
 g77 %{rpmcflags} asc2sbin.f -o asc2sbin
 g77 %{rpmcflags} inp2stru.f -o inp2stru
 g77 %{rpmcflags} sbin2asc.f -o sbin2asc
@@ -70,12 +71,12 @@ g77 %{rpmcflags} sbin2asc.f -o sbin2asc
 %install
 rm -rf $RPM_BUILD_ROOT
 
-cd discus/prog
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-cd ../../kuplot/prog
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
-cd ../../pdffit/prog
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install -C discus/prog \
+       DESTDIR=$RPM_BUILD_ROOT
+%{__make} install -C kuplot/prog \
+       DESTDIR=$RPM_BUILD_ROOT
+%{__make} install -C pdffit/prog \
+       DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT