From a988446e124bbdf30c14de37411ec7f84ce7b73d Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Tue, 17 Oct 2006 09:55:45 +0000
Subject: [PATCH] fixing #1851 (related to the livesupport -> campcaster
 renaming)

---
 livesupport/etc/configure.ac                  |  4 ++--
 .../src/products/gLiveSupport/etc/Makefile.in | 23 ++++++++++---------
 .../etc/campcaster-studio.xml.template        |  2 +-
 .../src/products/gLiveSupport/src/main.cxx    |  2 --
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/livesupport/etc/configure.ac b/livesupport/etc/configure.ac
index c446ea61f..61038f961 100644
--- a/livesupport/etc/configure.ac
+++ b/livesupport/etc/configure.ac
@@ -538,9 +538,9 @@ using the following configuration settings:
     station audio output device:     ${STATION_AUDIO_OUT}
     studio audio output device:      ${STUDIO_AUDIO_OUT}
     studio audio cue device:         ${STUDIO_AUDIO_CUE}
-    creating Campcaster database:   ${CREATE_LS_DATABASE}
+    creating Campcaster database:    ${CREATE_LS_DATABASE}
     creating ODBC data source:       ${CREATE_ODBC_DATA_SOURCE}
-    initialize Campcaster database: ${INIT_LS_DATABASE}
+    initialize Campcaster database:  ${INIT_LS_DATABASE}
     configuring apache:              ${CONFIGURE_APACHE}
 
 ])
diff --git a/livesupport/src/products/gLiveSupport/etc/Makefile.in b/livesupport/src/products/gLiveSupport/etc/Makefile.in
index 6a0dce722..cc20e1691 100644
--- a/livesupport/src/products/gLiveSupport/etc/Makefile.in
+++ b/livesupport/src/products/gLiveSupport/etc/Makefile.in
@@ -107,10 +107,11 @@ REPLACE_SED_STRING="s/ls_var_dir/${USR_VAR_DIR_S}/; \
     s/ls_scheduler_xmlRpcPrefix/${SCHEDULER_XML_RPC_PREFIX}/; \
     s/ls_scheduler_daemon_command/${SCHEDULER_DAEMON_COMMAND_S}/;"
 
-GENRB     = @GENRB@
+GENRB                   = @GENRB@
+RESOURCE_BUNDLE_NAME    = campcaster-studio
 GENRBOPTS = --destdir ${TMP_DIR} \
             --encoding utf-8 \
-            --package-name ${PACKAGE_NAME} \
+            --package-name ${RESOURCE_BUNDLE_NAME} \
             --strict
 
 VPATH    = ${SRC_DIR}
@@ -272,14 +273,14 @@ G_LIVESUPPORT_OBJS = ${TMP_DIR}/GLiveSupport.o \
                      ${TMP_DIR}/RestoreBackupWindow.o \
                      ${TMP_DIR}/TaskbarIcons.o
 
-G_LIVESUPPORT_RES = ${TMP_DIR}/${PACKAGE_NAME}_root.res \
-                    ${TMP_DIR}/${PACKAGE_NAME}_en.res \
-                    ${TMP_DIR}/${PACKAGE_NAME}_es.res \
-                    ${TMP_DIR}/${PACKAGE_NAME}_hu.res \
-                    ${TMP_DIR}/${PACKAGE_NAME}_nl.res \
-                    ${TMP_DIR}/${PACKAGE_NAME}_pl.res \
-                    ${TMP_DIR}/${PACKAGE_NAME}_sr_CS.res \
-                    ${TMP_DIR}/${PACKAGE_NAME}_sr_CS_CYRILLIC.res
+G_LIVESUPPORT_RES = ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_root.res \
+                    ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_en.res \
+                    ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_es.res \
+                    ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_hu.res \
+                    ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_nl.res \
+                    ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_pl.res \
+                    ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_sr_CS.res \
+                    ${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_sr_CS_CYRILLIC.res
 
 G_LIVESUPPORT_EXE_OBJS = ${TMP_DIR}/main.o
 
@@ -444,6 +445,6 @@ ${PLAYLIST_EXECUTOR_LIB_FILE}:
 ${TMP_DIR}/%.o : ${SRC_DIR}/%.cxx
 	${CXX} ${CPPFLAGS} ${CXXFLAGS} -c -o $@ $<
 
-${TMP_DIR}/${PACKAGE_NAME}_%.res : ${VAR_DIR}/%.txt
+${TMP_DIR}/${RESOURCE_BUNDLE_NAME}_%.res : ${VAR_DIR}/%.txt
 	${GENRB} ${GENRBOPTS} $^
 
diff --git a/livesupport/src/products/gLiveSupport/etc/campcaster-studio.xml.template b/livesupport/src/products/gLiveSupport/etc/campcaster-studio.xml.template
index b46ebfb60..497084383 100644
--- a/livesupport/src/products/gLiveSupport/etc/campcaster-studio.xml.template
+++ b/livesupport/src/products/gLiveSupport/etc/campcaster-studio.xml.template
@@ -119,7 +119,7 @@
 ]>
 
 <gLiveSupport>
-    <resourceBundle path   = "ls_var_dir/Campcaster/campcaster-studio"
+    <resourceBundle path   = "ls_var_dir/LiveSupport/campcaster-studio"
                     locale = "en"
     />
 
diff --git a/livesupport/src/products/gLiveSupport/src/main.cxx b/livesupport/src/products/gLiveSupport/src/main.cxx
index 7ca12c154..833130045 100644
--- a/livesupport/src/products/gLiveSupport/src/main.cxx
+++ b/livesupport/src/products/gLiveSupport/src/main.cxx
@@ -154,8 +154,6 @@ int main (  int     argc,
         return 1;
     }
 
-    std::cerr << "using config file '" << configFileName << '\'' << std::endl;
-
     Ptr<LiveSupport::GLiveSupport::GLiveSupport>::Ref
                     gLiveSupport(new LiveSupport::GLiveSupport::GLiveSupport());