[sr-dev] git:kamailio_3.0: kamctl: fix make use and make install

Andrei Pelinescu-Onciul andrei at iptel.org
Thu Aug 19 16:22:28 CEST 2010


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

Author: Andrei Pelinescu-Onciul <andrei at iptel.org>
Committer: Andrei Pelinescu-Onciul <andrei at iptel.org>
Date:   Wed Aug 11 19:49:09 2010 +0200

kamctl: fix make use and make install

- use $(MAKE) instead of directly using make.
- added targets for the install dirs (create bin_dir, cfg_dir and
  man_dirs if missing). This fixes make -C utils/kamctl install
  (allows installing only kamctl).
(cherry picked from commit 91ce090529ac1a1c6285f387e57013cad5598def)

---

 utils/kamctl/Makefile |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile
index 61bcee0..79c15c7 100644
--- a/utils/kamctl/Makefile
+++ b/utils/kamctl/Makefile
@@ -181,7 +181,7 @@ install-modules: $(bin_prefix)/$(bin_dir)
 					$(data_prefix)/$(data_dir)/oracle/admin/`basename "$$FILE"` ; \
 				fi ;\
 			done ; \
-			make -C ../db_oracle/ ; \
+			$(MAKE) -C ../db_oracle/ ; \
 			$(INSTALL_BIN) ../db_oracle/kamailio_orasel $(bin_prefix)/$(bin_dir) ; \
 		fi
 		# install Berkeley database stuff
@@ -206,7 +206,7 @@ install-modules: $(bin_prefix)/$(bin_dir)
 					$(data_prefix)/$(data_dir)/db_berkeley/kamailio/`basename "$$FILE"` ; \
 				fi ;\
 			done ; \
-			make -C ../db_berkeley/ ; \
+			$(MAKE) -C ../db_berkeley/ ; \
 			$(INSTALL_BIN) ../db_berkeley/kambdb_recover $(bin_prefix)/$(bin_dir) ; \
 		fi
 		# install dbtext stuff
@@ -236,3 +236,15 @@ install-modules: $(bin_prefix)/$(bin_dir)
 			done ;\
 		fi
 
+
+$(cfg_prefix)/$(cfg_dir):
+		mkdir -p $(cfg_prefix)/$(cfg_dir)
+
+$(bin_prefix)/$(bin_dir):
+		mkdir -p $(bin_prefix)/$(bin_dir)
+
+$(man_prefix)/$(man_dir)/man8:
+		mkdir -p $(man_prefix)/$(man_dir)/man8
+
+$(man_prefix)/$(man_dir)/man5:
+		mkdir -p $(man_prefix)/$(man_dir)/man5




More information about the sr-dev mailing list