Fix for #1892 - MAKE INSTALL fails. Fixed a number of problems that occurred due to renaming LS -> CC
This commit is contained in:
parent
94472a8f23
commit
5124344b3c
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
|
|
@ -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}
|
||||
|
|
Loading…
Reference in New Issue