Patch from SpiderX <spiderx@spiderx.dp.ua> - convertor -> sgconv

diff --git a/projects/sgconv/Makefile b/projects/sgconv/Makefile
index 04c00cc4935d0f98b03adffbbc0ebb778866a9dd..794114c779b3bf450ecf758721a6f80222c1a5f0 100644 (file)
--- a/projects/sgconv/Makefile
+++ b/projects/sgconv/Makefile
@@ -4,7 +4,7 @@
 
 include ../../Makefile.conf
 
-PROG = convertor
+PROG = sgconv
 
 SRCS = ./main.cpp \
        ./settings_impl.cpp

diff --git a/projects/sgconv/build b/projects/sgconv/build
index 471ee62cd165732d5292bb37e04e3298970beffe..601c01617e09463e17a952dc6567faa38738d5f7 100755 (executable)
--- a/projects/sgconv/build
+++ b/projects/sgconv/build
@@ -46,13 +46,13 @@ fi
 if [ "$OS" = "unknown" ]
 then 
     echo "#############################################################################"
-    echo "# Sorry, but convertor currently supported by Linux, FreeBSD 4.x, 5.x, 6.x  #"
+    echo "# Sorry, but sgconv currently supported by Linux, FreeBSD 4.x, 5.x, 6.x     #"
     echo "#############################################################################"
     exit 1
 fi
 
 echo "#############################################################################"
-echo "       Building convertor for $sys $release"
+echo "       Building sgconv for $sys $release"
 echo "#############################################################################"
 
 STG_LIBS="logger.lib 

diff --git a/projects/sgconv/settings_impl.h b/projects/sgconv/settings_impl.h
index eec21d685e09e348b647febb9156a7a969901ad8..3dfb9596e666cf1f5dcc1f3c6f2ea2201095cc76 100644 (file)
--- a/projects/sgconv/settings_impl.h
+++ b/projects/sgconv/settings_impl.h
@@ -38,7 +38,7 @@ class DOTCONFDocumentNode;
 
 class SETTINGS_IMPL {
 public:
-    SETTINGS_IMPL() : confFile("./convertor.conf") {}
+    SETTINGS_IMPL() : confFile("./sgconv.conf") {}
     SETTINGS_IMPL(const std::string & cf) : confFile(cf) {}
     ~SETTINGS_IMPL() {}
     int ReadSettings();