fixed #2072, this time possibly for real
This commit is contained in:
parent
a5ea42a1b7
commit
94e1f0bc53
|
@ -189,7 +189,8 @@ install_bin=$installdir/bin
|
|||
install_etc=$installdir/etc
|
||||
install_lib=$installdir/lib
|
||||
install_usr=$installdir/usr
|
||||
install_var_ls=$installdir/var/Campcaster
|
||||
install_var=$installdir/var
|
||||
install_var_ls=$install_var/Campcaster
|
||||
|
||||
|
||||
#-------------------------------------------------------------------------------
|
||||
|
@ -401,6 +402,7 @@ export LD_LIBRARY_PATH=$install_lib # is this needed here?
|
|||
export GST_REGISTRY=$install_etc/gst-registry.xml
|
||||
export GST_PLUGIN_PATH=$install_lib:$gstreamer_dir
|
||||
rm -f ${GST_REGISTRY}
|
||||
rm -f $install_var/cache/gstreamer-0.8/registry.xml
|
||||
$install_bin/gst-register
|
||||
|
||||
|
||||
|
|
|
@ -10,6 +10,7 @@ GSTREAMER_DIR=`find $CAMPCASTER_LIB -type d -name "gstreamer-*"`
|
|||
|
||||
PATH=/sbin:/bin:/usr/sbin:/usr/bin:$CAMPCASTER_BIN
|
||||
LD_LIBRARY_PATH=$CAMPCASTER_LIB:$LD_LIBRARY_PATH
|
||||
GST_REGISTRY=$CAMPCASTER_ETC/gst-registry.xml
|
||||
DAEMON=$CAMPCASTER_BIN/campcaster-scheduler
|
||||
NAME=campcaster-scheduler
|
||||
DESC="campcaster scheduler"
|
||||
|
@ -18,6 +19,7 @@ test -x $DAEMON || exit 0
|
|||
|
||||
export PATH
|
||||
export LD_LIBRARY_PATH
|
||||
export GST_REGISTRY
|
||||
|
||||
DAEMON_OPTS="-c $CAMPCASTER_ETC/campcaster-scheduler.xml"
|
||||
|
||||
|
|
|
@ -45,9 +45,8 @@ tmpdir=$basedir/tmp
|
|||
#-------------------------------------------------------------------------------
|
||||
# Set up the environment
|
||||
#-------------------------------------------------------------------------------
|
||||
gstreamer_dir=`find $libdir -type d -name "gstreamer-*"`
|
||||
|
||||
export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
|
||||
export GST_REGISTRY=$etcdir/gst-registry.xml
|
||||
studio_exe=$bindir/campcaster-studio
|
||||
|
||||
if [ -f ~/.campcaster/campcaster-studio.xml ]; then
|
||||
|
|
|
@ -43,9 +43,8 @@ libdir=$basedir/lib
|
|||
#-------------------------------------------------------------------------------
|
||||
# Set up the environment
|
||||
#-------------------------------------------------------------------------------
|
||||
gstreamer_dir=`find $libdir -type d -name "gstreamer-*"`
|
||||
|
||||
export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
|
||||
export GST_REGISTRY=$etcdir/gst-registry.xml
|
||||
scheduler_exe=$bindir/campcaster-scheduler
|
||||
config_file=$etcdir/campcaster-scheduler.xml
|
||||
|
||||
|
|
Loading…
Reference in New Issue