2003-07-08 08:30:55 +02:00
|
|
|
--- bin/gnump3d2.orig Fri Jul 4 10:20:24 2003
|
|
|
|
+++ bin/gnump3d2 Fri Jul 4 10:23:13 2003
|
|
|
|
@@ -2620,9 +2620,9 @@
|
2003-02-11 21:59:31 +01:00
|
|
|
{
|
|
|
|
$CONFIG_FILE = $ENV{"HOME"} . "/.gnump3drc";
|
|
|
|
}
|
|
|
|
- elsif ( -e "/etc/gnump3d/gnump3d.conf" )
|
|
|
|
+ elsif ( -e "%%PREFIX%%/etc/gnump3d/gnump3d.conf" )
|
|
|
|
{
|
|
|
|
- $CONFIG_FILE = "/etc/gnump3d/gnump3d.conf";
|
|
|
|
+ $CONFIG_FILE = "%%PREFIX%%/etc/gnump3d/gnump3d.conf";
|
|
|
|
}
|
|
|
|
elsif ( -e "gnump3d.conf" )
|
|
|
|
{
|
2003-07-08 08:30:55 +02:00
|
|
|
@@ -2764,8 +2764,8 @@
|
2003-05-01 23:46:08 +02:00
|
|
|
$PORT = getConfig( "port", 8888 );
|
|
|
|
$bind_address = getConfig( "binding_host", "" );
|
|
|
|
$host = getConfig( "hostname", "localhost" );
|
|
|
|
- $theme_dir = getConfig( "theme_directory", "/usr/share/gnump3d" );
|
|
|
|
- $plugin_dir = getConfig( "plugin_directory", "/usr/lib/perl5/gnump3d/plugins" );
|
|
|
|
+ $theme_dir = getConfig( "theme_directory", "%%PREFIX%%/share/gnump3d" );
|
|
|
|
+ $plugin_dir = getConfig( "plugin_directory", "%%PERL_SITELIBDIR%%/gnump3d/plugins" );
|
|
|
|
$always_stream = getConfig( "always_stream", 1 );
|
|
|
|
$access_log = getConfig( "logfile", "/var/log/gnump3d/access.log" );
|
|
|
|
$error_log = getConfig( "errorlog", "/var/log/gnump3d/error.log" );
|
2003-07-08 08:30:55 +02:00
|
|
|
@@ -2773,11 +2773,11 @@
|
2003-05-01 23:46:08 +02:00
|
|
|
$client_host = getConfig( "use_client_host", 1 );
|
|
|
|
$default_theme = getConfig( "theme", "default" );
|
|
|
|
$TIMEOUT = getConfig( "read_time", 10 );
|
|
|
|
- $STATSPROG = getConfig( "stats_program", "/usr/bin/gnump3d-top" );
|
2003-07-08 08:30:55 +02:00
|
|
|
- $INDEXPROG = getConfig( "index_program", "/usr/bin/gnump3d-index" );
|
2003-05-01 23:46:08 +02:00
|
|
|
+ $STATSPROG = getConfig( "stats_program", "%%PREFIX%%/bin/gnump3d-top" );
|
2003-07-08 08:30:55 +02:00
|
|
|
+ $INDEXPROG = getConfig( "index_program", "%%PREFIX%%/bin/gnump3d-index" );
|
2003-05-01 23:46:08 +02:00
|
|
|
$STATSARGS = getConfig( "stats_arguments", "" );
|
2003-05-08 14:22:22 +02:00
|
|
|
$play_rec = getConfig( "play_recursively_text", "Play" );
|
2003-05-01 23:46:08 +02:00
|
|
|
- $mime_file = getConfig( "mime_file", "/etc/gnump3d/mime.types" );
|
|
|
|
+ $mime_file = getConfig( "mime_file", "%%PREFIX%%/etc/gnump3d/mime.types" );
|
|
|
|
$enable_browse = getConfig( "enable_browsing", 1 );
|
|
|
|
$sort_order = getConfig( "sort_order", '$SONGNAME' );
|
2003-02-11 21:59:31 +01:00
|
|
|
|
2003-07-08 08:30:55 +02:00
|
|
|
@@ -2813,7 +2813,7 @@
|
|
|
|
# Experimental features.
|
|
|
|
#
|
|
|
|
$jukebox = getConfig( "jukebox_mode", 0 );
|
|
|
|
- $jukebox_binary = getConfig( "jukebox_player", "/usr/bin/mpg123" );
|
|
|
|
+ $jukebox_binary = getConfig( "jukebox_player", "%%PREFIX%%/bin/mpg123" );
|
|
|
|
if ( $jukebox )
|
|
|
|
{
|
|
|
|
$always_stream = 0;
|