Changeset 1854
- Timestamp:
- 01/05/07 07:49:05 (2 years ago)
- Files:
-
- trunk/swish-e/buildswishe.pl (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/swish-e/buildswishe.pl
r1851 r1854 715 715 $ENV{LD_RUN_PATH} ||= '.'; 716 716 717 $ENV{LD_RUN_PATH} = join(':', grep { /./ } map { $seen{$_}++ ? '' : $_ } @path, $ENV{LD_RUN_PATH}); 717 $ENV{LD_RUN_PATH} = join(':', 718 grep { /./ } map { $seen{$_}++ ? '' : $_ } @path, 719 $ENV{LD_RUN_PATH}); 718 720 719 721 # unset LD_LIBRARY_PATH for this script, so that tests accurately reflect what we've linked … … 1386 1388 "LIBS='$libs'", 1387 1389 1388 #"LDFLAGS=' -L$installdir/lib'",1390 #"LDFLAGS='$ld_opts'", 1389 1391 #LDFLAGS seems to be ignored by MakeMaker 1390 1392 # and/or not supported under some versions. … … 1397 1399 my $arg = join ' ', @a; 1398 1400 1401 $ENV{SWISHLIBS} = $libs; 1399 1402 $ENV{SWISHBINDIR} = "$installdir/bin"; 1400 1403 … … 1411 1414 print "$cmd\n"; 1412 1415 1413 nice_exit() if system($cmd );1416 nice_exit() if system($cmd); 1414 1417 make(); 1415 1418 make_test(); … … 1429 1432 1430 1433 delete $ENV{PERL5LIB}; # just in case we have it somewhere else... 1431 my $inc = join ' ', 1432 "-I" 1433 . File::Spec->catfile($perllib, $vers, $arch) . "-I" 1434 . File::Spec->catfile($perllib, 'site_perl', $vers, $arch), 1434 my $inc = join ' ', "-I" . File::Spec->catfile($perllib, $vers, $arch), 1435 "-I" . File::Spec->catfile($perllib, 'site_perl', $vers, $arch), 1435 1436 "-I" . File::Spec->catfile($perllib, $arch); 1436 1437
