blob: 2918245b64dbbab7106ae73085036f9c1db8f3f8 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- conflib.pl.orig 2006-11-22 06:53:21.000000000 -0800
+++ conflib.pl 2010-06-10 01:33:44.000000000 -0700
@@ -246,7 +246,7 @@
else
{
if ($OSf eq 'FreeBSD')
- { $prefix='/usr/local'; }
+ { $prefix=$ENV{'PREFIX'}; }
else
{ $prefix='/usr'; }
}
@@ -575,7 +575,7 @@
$ret.=' -pipe' if $UsePipe;
# Looks like that's common and some sysadmins doesn't configure gcc to
# look there:
- $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
+ $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
# gcc 4.x enables -Wpacked this by default.
$ver=RunRedirect("$GCC -dumpversion");
$ret.=' -Wno-packed' if $ver>=4;
@@ -607,7 +607,7 @@
return $ret;
}
$ret='';
- $ret.='/usr/local/lib' if ($OSf eq 'FreeBSD');
+ $ret.=$ENV{'LOCALBASE'} . '/lib' if ($OSf eq 'FreeBSD');
$conf{'LDExtraDirs'}=$ret;
$ret;
}
@@ -650,8 +650,8 @@
{
$ret='-O2'; # -gstabs+3';
$ret.=' -pipe' if $UsePipe;
- $ret.=' -L/usr/local/include' if ($OSf eq 'FreeBSD');
- $conf{'EXTRA_INCLUDE_DIRS'}.=' /usr/local/include' if ($OSf eq 'FreeBSD');
+ $ret.=' -L' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
+ $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD');
}
}
print "$ret\n";
@@ -1444,7 +1444,7 @@
die;
}
if (($OSf eq 'Darwin') || ($OSf eq 'HP-UX') || ($OSf eq 'Tru64') ||
- ($OSf eq 'Solaris'))
+ ($OSf eq 'Solaris') || ($OSf eq 'FreeBSD'))
{
$conf{'GNU_AR'}='ar';
$conf{'UseRanLib'}=1;
|
