aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Gompa <ngompa13@gmail.com>2016-03-16 18:01:52 -0400
committerNeal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>2016-05-04 10:28:54 -0400
commit41e86abfd85387bfd187a88e8e49aba0d18c3a7e (patch)
tree85e00524c522ac1702994be90b2867f95e78b25d
parent614938b4624072a3895be8f7bd74659db4819197 (diff)
downloadrpm-setup-41e86abfd85387bfd187a88e8e49aba0d18c3a7e.tar
rpm-setup-41e86abfd85387bfd187a88e8e49aba0d18c3a7e.tar.gz
rpm-setup-41e86abfd85387bfd187a88e8e49aba0d18c3a7e.tar.bz2
rpm-setup-41e86abfd85387bfd187a88e8e49aba0d18c3a7e.tar.xz
rpm-setup-41e86abfd85387bfd187a88e8e49aba0d18c3a7e.zip
Remove redundant %_make_bin & mark %make as deprecated
-rw-r--r--build.macros.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/build.macros.in b/build.macros.in
index 612a238..7b0ed1b 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -205,8 +205,10 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
if [ -n "$ncpus_max" ] && [ "$ncpus_max" -gt 0 ] && [ "$RPM_BUILD_NCPUS" -gt "$ncpus_max" ]; then RPM_BUILD_NCPUS="$ncpus_max"; fi; \\\
[ "$RPM_BUILD_NCPUS" -gt 1 ] && echo "-j$RPM_BUILD_NCPUS")
-%_make_bin make
-%make %{_make_bin} -O %_smp_mflags
+
+%make \
+ echo "warning: %%make is deprecated, try %%make_build instead" 1>&2\
+ %{__make} -O %_smp_mflags
%makeinstall_std \
echo "warning: %%makeinstall_std is deprecated, try %%make_install instead" 1>&2\