[sr-dev] git:sr_3.0: makefile: fix install utils

Andrei Pelinescu-Onciul andrei at iptel.org
Fri Mar 26 08:50:37 CET 2010


Module: sip-router
Branch: sr_3.0
Commit: 7a3daa1752056891739c8a9e60e41e1009af9505
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a3daa1752056891739c8a9e60e41e1009af9505

Author: Daniel-Constantin Mierla <miconda at gmail.com>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Mon Mar 22 16:33:04 2010 +0100

makefile: fix install utils

- previous commit broke installation of utils by a c&p error to
  non-empty test to utils variable (r => ut)
- extra check for directory existence
- credits to Federico M. and Nathaniel L Keeling III for reporting
(cherry picked from commit 641a41b6e9cf1387c24dd9f863db978c8018df80)

---

 Makefile |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0132d71..52f98f8 100644
--- a/Makefile
+++ b/Makefile
@@ -986,8 +986,10 @@ install-utils: utils $(bin_prefix)/$(bin_dir)
 		fi ; \
 	done; true
 	@for ut in $(C_INSTALL_UTILS) "" ; do \
-		if [ -n "$$r" ]; then \
-			$(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\
+		if [ -n "$$ut" ]; then \
+			if [ -d "$$ut" ]; then \
+				$(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\
+			fi ;\
 		fi ; \
 	done; true
 




More information about the sr-dev mailing list