Fixes #15734: Trace doesn't exist on old make

Normation · Sep 17, 2019 · b079a5c · b079a5c
1 parent e74e4ae
commit b079a5c
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/rudder-api-client/Makefile b/rudder-api-client/Makefile
@@ -1,4 +1,4 @@
 .DEFAULT_GOAL := build
 # Used on debian to redirect calls to final Makefile so dh auto commands work
 %:
-	make -C BUILD/rudder-api-client/ --trace $@
+	make -C BUILD/rudder-api-client/ --debug $@
diff --git a/rudder-api-client/SPECS/rudder-api-client.spec b/rudder-api-client/SPECS/rudder-api-client.spec
@@ -78,7 +78,7 @@ find . -type f | xargs sed -i '1,1s|#!/usr/bin/python3|#!/usr/bin/python2|'
 %install
 cd rudder-sources-*/rudder-api-client/
 
-make --trace install DESTDIR=%{buildroot}
+make --debug install DESTDIR=%{buildroot}
 
 #=================================================
 # Cleaning

diff --git a/rudder-reports/Makefile b/rudder-reports/Makefile
@@ -1,4 +1,4 @@
 .DEFAULT_GOAL := build
 # Used on debian to redirect calls to final Makefile so dh auto commands work
 %:
-	make -C SOURCES --trace $@
+	make -C SOURCES --debug $@
diff --git a/rudder-reports/SPECS/rudder-reports.spec b/rudder-reports/SPECS/rudder-reports.spec
@@ -81,7 +81,7 @@ calculate compliance to given configuration rules.
 rm -rf %{buildroot}
 
 cd %{_sourcedir}
-make --trace install DESTDIR=%{buildroot}
+make --debug install DESTDIR=%{buildroot}
 
 
 #=================================================

diff --git a/rudder-server-relay/Makefile b/rudder-server-relay/Makefile
@@ -1,4 +1,4 @@
 .DEFAULT_GOAL := build
 # Used on debian to redirect calls to final Makefile so dh auto commands work
 %:
-	make -C BUILD/rudder/relay/sources/ --trace $@
+	make -C BUILD/rudder/relay/sources/ --debug $@
diff --git a/rudder-server-relay/SPECS/rudder-server-relay.spec b/rudder-server-relay/SPECS/rudder-server-relay.spec
@@ -133,9 +133,9 @@ sed -i "s%^DocumentRoot /var/www$%DocumentRoot /srv/www%" apache/rudder-apache-r
 %endif
 
 %if 0%{?rhel} == 7
-make --trace build SELINUX=%{selinux} PYTHON=python2
+make --debug build SELINUX=%{selinux} PYTHON=python2
 %else
-make --trace build SELINUX=%{selinux}
+make --debug build SELINUX=%{selinux}
 %endif
 
 #=================================================
@@ -147,7 +147,7 @@ cd rudder-sources-*/rudder/relay/sources/
 # TODO remove
 rm -rf %{buildroot}
 
-make --trace install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} SELINUX=%{selinux}
+make --debug install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} SELINUX=%{selinux}
 
 mkdir -p %{buildroot}/etc/sysconfig/
 install -m 644 rudder-relay-apache %{buildroot}/etc/sysconfig/rudder-relay-apache

diff --git a/rudder-server-root/Makefile b/rudder-server-root/Makefile
@@ -1,4 +1,4 @@
 .DEFAULT_GOAL := build
 # Used on debian to redirect calls to final Makefile so dh auto commands work
 %:
-	make -C SOURCES --trace $@
+	make -C SOURCES --debug $@
diff --git a/rudder-server-root/SPECS/rudder-server-root.spec b/rudder-server-root/SPECS/rudder-server-root.spec
@@ -74,7 +74,7 @@ run a Rudder root server on a machine.
 cd %{_sourcedir}
 
 cd %{_sourcedir}
-make --trace install DESTDIR=%{buildroot}
+make --debug install DESTDIR=%{buildroot}
 
 #=================================================
 # pretrans is run before all preinst when installing more than one package

diff --git a/rudder-webapp/Makefile b/rudder-webapp/Makefile
@@ -1,4 +1,4 @@
 .DEFAULT_GOAL := build
 # Used on debian to redirect calls to final Makefile so dh auto commands work
 %:
-	make -C SOURCES --trace $@
+	make -C SOURCES --debug $@
diff --git a/rudder-webapp/SPECS/rudder-webapp.spec b/rudder-webapp/SPECS/rudder-webapp.spec
@@ -139,7 +139,7 @@ Rudder.
 %prep
 
 cd %{_sourcedir}
-make --trace rudder-sources
+make --debug rudder-sources
 
 # rhel7 and sles12 don't have mod wsgi python 3 so we force python2 instead
 %if 0%{?rhel} == 7 || ( 0%{?suse_version} && 0%{?suse_version} < 1500 )
@@ -156,9 +156,9 @@ export CFLAGS="$RPM_OPT_FLAGS"
 
 cd %{_sourcedir}
 %if 0%{?rhel} == 7 || ( 0%{?suse_version} && 0%{?suse_version} < 1500 )
-make --trace build PYTHON=python2
+make --debug build PYTHON=python2
 %else
-make --trace build
+make --debug build
 %endif
 
 %if 0%{?rhel}
@@ -177,9 +177,9 @@ rm -rf %{buildroot}
 cd %{_sourcedir}
 # python should not be needed at install time, but build is run twice, i don't know why
 %if 0%{?rhel} == 7 || ( 0%{?suse_version} && 0%{?suse_version} < 1500 )
-make --trace install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} JETTY_SCRIPT=%{jetty_init_script} APACHE_CONFDIR=%{apache_vhost_dir} PYTHON=python2
+make --debug install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} JETTY_SCRIPT=%{jetty_init_script} APACHE_CONFDIR=%{apache_vhost_dir} PYTHON=python2
 %else
-make --trace install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} JETTY_SCRIPT=%{jetty_init_script} APACHE_CONFDIR=%{apache_vhost_dir}
+make --debug install APACHE_VHOSTDIR=%{apache_vhost_dir} DESTDIR=%{buildroot} JETTY_SCRIPT=%{jetty_init_script} APACHE_CONFDIR=%{apache_vhost_dir}
 %endif
 
 %if 0%{?rhel}