parent
45bb13db2d
commit
9dd4325251
30
0001-Don-t-copy-Makefile.dist-to-Makefile-in-distclean.patch
Normal file
30
0001-Don-t-copy-Makefile.dist-to-Makefile-in-distclean.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From 119a0e33ee6a023f32b256b8bafa5f972ecc480f Mon Sep 17 00:00:00 2001
|
||||
From: Michal Sekletar <msekleta@redhat.com>
|
||||
Date: Tue, 28 Feb 2017 12:29:55 +0100
|
||||
Subject: [PATCH] Don't copy Makefile.dist to Makefile in distclean
|
||||
|
||||
Note that make doesn't wait for this background task to finish. During
|
||||
rpm build we are building mtr twice. After first build we call
|
||||
distclean. If second invocation of configure script runs in less than 3
|
||||
seconds then the Makefile generated by configure will be overwritten by
|
||||
background copy. We don't want that and since we are calling configure
|
||||
explicitly we don't really need this "feature" at all.
|
||||
---
|
||||
Makefile.am | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index fa9a2dd..adf43c0 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -44,7 +44,6 @@ version.h: version.h.tmp Makefile $(mtr_SOURCES)
|
||||
|
||||
EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist
|
||||
distclean-local:
|
||||
- (sleep 3; cp Makefile.dist Makefile) &
|
||||
rm -f *.orig
|
||||
|
||||
DISTCLEANFILES = *~
|
||||
--
|
||||
2.9.3
|
||||
|
Loading…
Reference in New Issue
Block a user