Просмотр исходного кода

db_sqlite: fix path in Makefile and utility script

Henning Westerholt 14 лет назад
Родитель
Сommit
9483a2092f
2 измененных файлов с 7 добавлено и 7 удалено
  1. 4 4
      utils/kamctl/Makefile
  2. 3 3
      utils/kamctl/kamdbctl.sqlite

+ 4 - 4
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

+ 3 - 3
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
 
 #################################################################