[3.0] 48a0c44 Stopped using macros for make and install, according to Fedora's packaging guidelines

Tollef Fog Heen tfheen at varnish-cache.org
Thu May 24 14:51:11 CEST 2012


commit 48a0c44775b86c2b2e19a08461ec3c1bd3869ba9
Author: Ingvar Hagelund <ingvar at redpill-linpro.com>
Date:   Mon Apr 23 10:43:20 2012 +0200

    Stopped using macros for make and install, according to Fedora's packaging guidelines

diff --git a/redhat/varnish.spec b/redhat/varnish.spec
index 5ecb85f..6f6d71e 100644
--- a/redhat/varnish.spec
+++ b/redhat/varnish.spec
@@ -98,7 +98,7 @@ cp bin/varnishd/default.vcl etc/zope-plone.vcl examples
 #sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
 #	s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 head -6 etc/default.vcl > redhat/default.vcl
 
@@ -138,7 +138,7 @@ cp -r doc/sphinx/\=build/html doc
 	%endif
 %endif
 
-%{__make} check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs:../../lib/libvgz/.libs"
+make check LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcl/.libs:../../lib/libvgz/.libs"
 
 %install
 rm -rf %{buildroot}



More information about the varnish-commit mailing list