[sr-dev] git:master: db_sqlite: fix path in Makefile and utility script

Henning Westerholt henning.westerholt at 1und1.de
Mon Jun 20 13:46:24 CEST 2011


Module: sip-router
Branch: master
Commit: 9483a2092f05ed34698e53e628fb879d00871ce7
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9483a2092f05ed34698e53e628fb879d00871ce7

Author: Henning Westerholt <henning.westerholt at 1und1.de>
Committer: Henning Westerholt <henning.westerholt at 1und1.de>
Date:   Mon Jun 20 13:44:26 2011 +0200

db_sqlite: fix path in Makefile and utility script

---

 utils/kamctl/Makefile        |    8 ++++----
 utils/kamctl/kamdbctl.sqlite |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile
index 8b0f790..4a3a08a 100644
--- a/utils/kamctl/Makefile
+++ b/utils/kamctl/Makefile
@@ -258,13 +258,13 @@ install-modules: $(bin_prefix)/$(bin_dir)
 			$(INSTALL_TOUCH) $(modules_prefix)/$(lib_dir)/kamctl/kamdbctl.sqlite ; \
 			$(INSTALL_CFG) /tmp/kamdbctl.sqlite $(modules_prefix)/$(lib_dir)/kamctl/ ; \
 			rm -fr /tmp/kamdbctl.sqlite ; \
-			mkdir -p $(data_prefix)/$(data_dir)/sqlite ; \
-			for FILE in $(wildcard sqlite/*) ; do \
+			mkdir -p $(data_prefix)/$(data_dir)/db_sqlite ; \
+			for FILE in $(wildcard db_sqlite/*) ; do \
 				if [ -f $$FILE ] ; then \
 				$(INSTALL_TOUCH) $$FILE \
-					$(data_prefix)/$(data_dir)/sqlite/`basename "$$FILE"` ; \
+					$(data_prefix)/$(data_dir)/db_sqlite/`basename "$$FILE"` ; \
 				$(INSTALL_CFG) $$FILE \
-					$(data_prefix)/$(data_dir)/sqlite/`basename "$$FILE"` ; \
+					$(data_prefix)/$(data_dir)/db_sqlite/`basename "$$FILE"` ; \
 				fi ;\
 			done ; \
 		fi
diff --git a/utils/kamctl/kamdbctl.sqlite b/utils/kamctl/kamdbctl.sqlite
index ecb51aa..3478b26 100644
--- a/utils/kamctl/kamdbctl.sqlite
+++ b/utils/kamctl/kamdbctl.sqlite
@@ -5,10 +5,10 @@
 
 # path to the database schemas
 DATA_DIR="/usr/local/share/kamailio"
-if [ -d "$DATA_DIR/sqlite" ] ; then
-	DB_SCHEMA="$DATA_DIR/sqlite"
+if [ -d "$DATA_DIR/db_sqlite" ] ; then
+	DB_SCHEMA="$DATA_DIR/db_sqlite"
 else
-	DB_SCHEMA="./sqlite"
+	DB_SCHEMA="./db_sqlite"
 fi
 
 #################################################################




More information about the sr-dev mailing list