From 5124344b3cd8dc570c01ab958bd3e79609a50fd7 Mon Sep 17 00:00:00 2001
From: paul <paul@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Wed, 25 Oct 2006 17:42:57 +0000
Subject: [PATCH] Fix for #1892 - MAKE INSTALL fails.  Fixed a number of
 problems that occurred due to renaming LS -> CC

---
 .../{livesupport-station => campcaster-scheduler}  |  0
 campcaster/etc/Makefile.in                         |  2 +-
 campcaster/src/modules/getid3/etc/Makefile.in      |  2 +-
 .../src/products/gLiveSupport/etc/Makefile.in      | 14 +++++++-------
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename campcaster/bin/{livesupport-station => campcaster-scheduler} (100%)

diff --git a/campcaster/bin/livesupport-station b/campcaster/bin/campcaster-scheduler
similarity index 100%
rename from campcaster/bin/livesupport-station
rename to campcaster/bin/campcaster-scheduler
diff --git a/campcaster/etc/Makefile.in b/campcaster/etc/Makefile.in
index a3403b5ca..4cb8e256c 100644
--- a/campcaster/etc/Makefile.in
+++ b/campcaster/etc/Makefile.in
@@ -468,7 +468,7 @@ install: setup compile setup_install_dirs create_database install_modules instal
 	${CP} ${ETC_DIR}/apache/*.conf ${USR_ETC_DIR}/apache
 	${MKDIR} ${USR_BIN_DIR}
 	${CP} ${BIN_DIR}/postInstallStation.sh ${USR_BIN_DIR}
-	${CP} ${BIN_DIR}/campcaster-station ${USR_BIN_DIR}
+	${CP} ${BIN_DIR}/campcaster-scheduler ${USR_BIN_DIR}
 	${CP} ${ETC_DIR}/pg_hba.conf ${USR_ETC_DIR}
 
 create_database:
diff --git a/campcaster/src/modules/getid3/etc/Makefile.in b/campcaster/src/modules/getid3/etc/Makefile.in
index 8806a0f88..7d8310c43 100644
--- a/campcaster/src/modules/getid3/etc/Makefile.in
+++ b/campcaster/src/modules/getid3/etc/Makefile.in
@@ -120,7 +120,7 @@ check: all
 
 install:
 	${MKDIR} ${USR_VAR_DIR}/Campcaster/getid3/var
-	${CP} ${VAR_DIR}/*.{php,txt} ${USR_VAR_DIR}/Campcaster/getid3/var
+	${CP} ${VAR_DIR}/*.php ${USR_VAR_DIR}/Campcaster/getid3/var
 
 
 #-------------------------------------------------------------------------------
diff --git a/campcaster/src/products/gLiveSupport/etc/Makefile.in b/campcaster/src/products/gLiveSupport/etc/Makefile.in
index cc20e1691..70f40ea7e 100644
--- a/campcaster/src/products/gLiveSupport/etc/Makefile.in
+++ b/campcaster/src/products/gLiveSupport/etc/Makefile.in
@@ -350,19 +350,19 @@ install: all
 	${MAKE} -C ${PLAYLIST_EXECUTOR_DIR} install
 	${MKDIR} ${USR_BIN_DIR}
 	${MKDIR} ${USR_ETC_DIR}
-	${MKDIR} ${USR_VAR_DIR}/LiveSupport
-	${CP} ${TMP_DIR}/*.res ${USR_VAR_DIR}/LiveSupport
+	${MKDIR} ${USR_VAR_DIR}/Campcaster
+	${CP} ${TMP_DIR}/*.res ${USR_VAR_DIR}/Campcaster
 	${CP} ${VAR_DIR}/campcaster.png \
 	      ${VAR_DIR}/stationLogo.png \
 	      ${VAR_DIR}/icon*.png \
 	      ${VAR_DIR}/testAudio.ogg \
-	      ${VAR_DIR}/testAudio.ogg.license ${USR_VAR_DIR}/LiveSupport
-	${CP} ${BIN_DIR}/gLiveSupport.sh ${USR_BIN_DIR}
+	      ${VAR_DIR}/testAudio.ogg.license ${USR_VAR_DIR}/Campcaster
+	${CP} ${BIN_DIR}/campcaster-studio.sh ${USR_BIN_DIR}
 	${CP} ${G_LIVESUPPORT_EXE} ${USR_BIN_DIR}
-	${CP} ${ETC_DIR}/gLiveSupport.xml.template ${USR_ETC_DIR}
-	${CAT} ${ETC_DIR}/gLiveSupport.xml.template | \
+	${CP} ${ETC_DIR}/campcaster-studio.xml.template ${USR_ETC_DIR}
+	${CAT} ${ETC_DIR}/campcaster-studio.xml.template | \
 	       ${SED} -e ${REPLACE_SED_STRING} \
-	       > ${USR_ETC_DIR}/gLiveSupport.xml
+	       > ${USR_ETC_DIR}/campcaster-studio.xml
 
 run_tests: ${TEST_RUNNER}
 	${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT}