Changeset 18959

Show
Ignore:
Timestamp:
14.04.2009 20:28:03 (10 years ago)
Author:
davidb
Message:

Adjusted setup.pl to use the new location of bin and lib files

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • extensions/gsdl-video/trunk/setup.pl

    r18942 r18959  
    1919    = &util::filename_cat($ENV{'GEXTVIDEO'},"installed"); 
    2020 
    21     my $server_bin  = "$ENV{'GEXTVIDEO_INSTALLED'}/server/bin"; 
    22     my $cmdline_bin = "$ENV{'GEXTVIDEO_INSTALLED'}/cmdline/bin"; 
     21    my $video_bin 
     22    = &util::filename_cat($ENV{'GEXTVIDEO_INSTALLED'},$ENV{'GSDLOS'},"bin"); 
     23    my $video_lib 
     24    = &util::filename_cat($ENV{'GEXTVIDEO_INSTALLED'},$ENV{'GSDLOS'},"lib"); 
    2325 
    24     &util::envvar_append("PATH",$server_bin); 
    25     &util::envvar_append("PATH",$cmdline_bin); 
    26  
    27     my $server_lib  = "$ENV{'GEXTVIDEO_INSTALLED'}/server/lib"; 
    28     my $cmdline_lib = "$ENV{'GEXTVIDEO_INSTALLED'}/cmdline/lib"; 
     26    &util::envvar_append("PATH",$video_bin); 
    2927 
    3028    # For Linux (no harm is setting is this for MacOs) 
    31     &util::envvar_append("LD_LIBRARY_PATH",$server_lib); 
    32     &util::envvar_append("LD_LIBRARY_PATH",$cmdline_lib); 
     29    &util::envvar_append("LD_LIBRARY_PATH",$video_lib); 
    3330     
    3431    # For MacOs (no harm is setting is this for Linux etc) 
    35     &util::envvar_append("DYLD_LIBRARY_PATH",$server_lib); 
    36     &util::envvar_append("DYLD_LIBRARY_PATH",$cmdline_lib); 
     32    &util::envvar_append("DYLD_LIBRARY_PATH",$video_lib); 
    3733 
    3834