From 26c7e0d22ead805ce333ea4248c7311c1eda5de0 Mon Sep 17 00:00:00 2001 From: Andreas Eversberg Date: Sun, 21 Sep 2008 08:57:51 +0200 Subject: Finished autoconf. -> Commments are welcome. deleted: Makefile modified: Makefile.am new file: Makefile.in modified: README new file: aclocal.m4 modified: action_vbox.cpp modified: alawulaw.h modified: autogen.sh new file: config.h.in new file: configure modified: configure.ac modified: default/interface.conf modified: default/options.conf modified: dss1.cpp modified: dss1.h modified: extension.c modified: genext.c modified: interface.c modified: interface.h modified: mISDN.cpp modified: mISDN.h modified: main.h new file: mkinstalldirs modified: options.c modified: options.h modified: port.cpp modified: route.c modified: todo.txt modified: tones.c modified: vbox.cpp deleted: watch.c --- action_vbox.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'action_vbox.cpp') diff --git a/action_vbox.cpp b/action_vbox.cpp index 039449f..56028ce 100644 --- a/action_vbox.cpp +++ b/action_vbox.cpp @@ -136,7 +136,7 @@ void EndpointAppPBX::vbox_index_read(int num) e_vbox_index_num = 0; - SPRINT(filename, "%s/%s/%s/vbox/index", INSTALL_DATA, options.extensions_dir, e_vbox); + SPRINT(filename, "%s/%s/vbox/index", EXTENSION_DATA, e_vbox); if (!(fp = fopen(filename, "r"))) { PDEBUG(DEBUG_EPOINT, "EPOINT(%d) no files in index\n", ea_endpoint->ep_serial); @@ -194,8 +194,8 @@ void EndpointAppPBX::vbox_index_remove(int num) PDEBUG(DEBUG_EPOINT, "EPOINT(%d) removing entrie #%d\n", ea_endpoint->ep_serial, num); - SPRINT(filename1, "%s/%s/%s/vbox/index", INSTALL_DATA, options.extensions_dir, e_vbox); - SPRINT(filename2, "%s/%s/%s/vbox/index-temp", INSTALL_DATA, options.extensions_dir, e_vbox); + SPRINT(filename1, "%s/%s/vbox/index", EXTENSION_DATA, e_vbox); + SPRINT(filename2, "%s/%s/vbox/index-temp", EXTENSION_DATA, e_vbox); if (!(fpr = fopen(filename1, "r"))) { return; @@ -348,12 +348,12 @@ void EndpointAppPBX::action_dialing_vbox_play(void) case '1': PDEBUG(DEBUG_EPOINT, "EPOINT(%d) do store/delete.\n", ea_endpoint->ep_serial); - SPRINT(filename, "%s/%s/%s/vbox/%s", INSTALL_DATA, options.extensions_dir, e_vbox, e_vbox_index_file); + SPRINT(filename, "%s/%s/vbox/%s", EXTENSION_DATA, e_vbox, e_vbox_index_file); /* move file */ if (e_vbox_state == VBOX_STATE_STORE_ASK) { - SPRINT(filename, "%s/%s/%s/recordings", INSTALL_DATA, options.extensions_dir, e_vbox); + SPRINT(filename, "%s/%s/recordings", EXTENSION_DATA, e_vbox); if (mkdir(filename, 0755) < 0) { if (errno != EEXIST) @@ -362,7 +362,7 @@ void EndpointAppPBX::action_dialing_vbox_play(void) goto done; } } - SPRINT(filename2, "%s/%s/%s/recordings/%s", INSTALL_DATA, options.extensions_dir, e_vbox, e_vbox_index_file); + SPRINT(filename2, "%s/%s/recordings/%s", EXTENSION_DATA, e_vbox, e_vbox_index_file); rename(filename, filename2); e_vbox_state = VBOX_STATE_STORE_DONE; if (e_ext.vbox_language) @@ -922,7 +922,7 @@ void EndpointAppPBX::set_play_vbox(const char *file, int offset) char filename[256]; struct lcr_msg *message; - SPRINT(filename, "%s/%s/%s/vbox/%s", INSTALL_DATA, options.extensions_dir, e_vbox, file); + SPRINT(filename, "%s/%s/vbox/%s", EXTENSION_DATA, e_vbox, file); /* remove .wav */ if (!strcmp(filename+strlen(filename)-4, ".wav")) /* filename is always more than 4 digits long */ -- cgit v1.2.3-55-g7522