aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-06-29 06:22:54 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-06-29 06:41:19 -0400
commitd7f1b5b54d391e75217e19e021b0c63e40eab60d (patch)
tree7dd75c7e8d0ce9ba5bc17d3af148c68b7bfb405b
parent6423700bae8a751c11864222717f05081065609b (diff)
downloadrpm-setup-d7f1b5b54d391e75217e19e021b0c63e40eab60d.tar
rpm-setup-d7f1b5b54d391e75217e19e021b0c63e40eab60d.tar.gz
rpm-setup-d7f1b5b54d391e75217e19e021b0c63e40eab60d.tar.bz2
rpm-setup-d7f1b5b54d391e75217e19e021b0c63e40eab60d.tar.xz
rpm-setup-d7f1b5b54d391e75217e19e021b0c63e40eab60d.zip
kill %old_makeinstall2.11
if people really want it, there's upstream %makeinstall
-rw-r--r--NEWS1
-rw-r--r--build.macros.in18
2 files changed, 1 insertions, 18 deletions
diff --git a/NEWS b/NEWS
index 9bdecdb..c21eac5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- deprecate %makeinstall_std and advertize upstream %make_install instead
+- kill %old_makeinstall (use upstream %makeinstall instead)
Version 2.10 - 28 June 2015, by Thierry Vignaud
diff --git a/build.macros.in b/build.macros.in
index 534d7ef..3e542e5 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -313,24 +313,6 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
# (Note: Above is the goal, below are the macros under development)
#
-%old_makeinstall \
- make \\\
- prefix=%{?buildroot:%{buildroot}}%{_prefix} \\\
- exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \\\
- bindir=%{?buildroot:%{buildroot}}%{_bindir} \\\
- sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \\\
- sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \\\
- datadir=%{?buildroot:%{buildroot}}%{_datadir} \\\
- includedir=%{?buildroot:%{buildroot}}%{_includedir} \\\
- libdir=%{?buildroot:%{buildroot}}%{_libdir} \\\
- libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \\\
- localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \\\
- sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \\\
- mandir=%{?buildroot:%{buildroot}}%{_mandir} \\\
- infodir=%{?buildroot:%{buildroot}}%{_infodir} \\\
- install
-
-
#------------------------------------------------------------------------------
# Useful python macros
%pyver %(python -V 2>&1 | cut -f2 -d" " | cut -f1,2 -d".")