[sr-dev] git:sr_3.0: makefile: fix install-cfg & install-utils on solaris

Andrei Pelinescu-Onciul andrei at iptel.org
Wed Mar 17 20:57:28 CET 2010


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

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Tue Mar 16 18:15:56 2010 +0100

makefile: fix install-cfg & install-utils on solaris

Reported-by: Nathaniel L Keeling  keeling akan-tech com
(cherry picked from commit ad57482b7d05417f7f0058cef8c698f18d6d9a39)

---

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

diff --git a/Makefile b/Makefile
index 0fcb418..0132d71 100644
--- a/Makefile
+++ b/Makefile
@@ -897,8 +897,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir)
 			mv -f $(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg.sample \
 				$(cfg_prefix)/$(cfg_dir)$(MAIN_NAME)-advanced.cfg; \
 		fi
-		# other configs
-		@for r in $(C_INSTALL_CFGS) ; do \
+		@# other configs
+		@for r in $(C_INSTALL_CFGS) ""; do \
 			if [ -n "$$r" ]; then \
 				if [ -f "$$r" ]; then \
 					n=`basename "$$r"` ; \
@@ -985,8 +985,10 @@ install-utils: utils $(bin_prefix)/$(bin_dir)
 			fi ;\
 		fi ; \
 	done; true
-	@for ut in $(C_INSTALL_UTILS) ; do \
-		$(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\
+	@for ut in $(C_INSTALL_UTILS) "" ; do \
+		if [ -n "$$r" ]; then \
+			$(call try_err, $(MAKE) -C "$${ut}" install-if-newer ) ;\
+		fi ; \
 	done; true
 
 




More information about the sr-dev mailing list