diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-10-27 11:01:32 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-10-27 11:01:32 +0000 |
| commit | 3fbea6477da0d85c22838896d9f0ce3a72ec0334 (patch) | |
| tree | 474ef05e75a2f9ac03dd466e7b27c85250cb1160 /editors/setedit/files/patch-conflib.pl | |
| parent | - Register CONFLICTS with jed-devel (diff) | |
- Respect LOCALBASE/PREFIX
- Fix ia64
Submitted by: Sten Feldman <exile@chamber.ee> (maintainer)
Notes
Notes:
svn path=/head/; revision=146468
Diffstat (limited to 'editors/setedit/files/patch-conflib.pl')
| -rw-r--r-- | editors/setedit/files/patch-conflib.pl | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/editors/setedit/files/patch-conflib.pl b/editors/setedit/files/patch-conflib.pl new file mode 100644 index 000000000000..b3baeba9d1dd --- /dev/null +++ b/editors/setedit/files/patch-conflib.pl @@ -0,0 +1,72 @@ +*** conflib.pl.orig Wed Oct 26 21:55:24 2005 +--- conflib.pl Wed Oct 26 21:57:36 2005 +*************** +*** 246,252 **** + else + { + if ($OSf eq 'FreeBSD') +! { $prefix='/usr/local'; } + else + { $prefix='/usr'; } + } +--- 246,252 ---- + else + { + if ($OSf eq 'FreeBSD') +! { $prefix=$ENV{'PREFIX'}; } + else + { $prefix='/usr'; } + } +*************** +*** 567,573 **** + $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'); + } + } + print "$ret\n"; +--- 567,573 ---- + $ret.=' -pipe' if $UsePipe; + # Looks like that's common and some sysadmins doesn't configure gcc to + # look there: +! $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD'); + } + } + print "$ret\n"; +*************** +*** 596,602 **** + return $ret; + } + $ret=''; +! $ret.='/usr/local/lib' if ($OSf eq 'FreeBSD'); + $conf{'LDExtraDirs'}=$ret; + $ret; + } +--- 596,602 ---- + return $ret; + } + $ret=''; +! $ret.=$ENV{'LOCALBASE'} . '/lib' if ($OSf eq 'FreeBSD'); + $conf{'LDExtraDirs'}=$ret; + $ret; + } +*************** +*** 639,646 **** + { + $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'); + } + } + print "$ret\n"; +--- 639,646 ---- + { + $ret='-O2'; # -gstabs+3'; + $ret.=' -pipe' if $UsePipe; +! $ret.=' -L' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD'); +! $conf{'EXTRA_INCLUDE_DIRS'}.=' ' . $ENV{'LOCALBASE'} . '/include' if ($OSf eq 'FreeBSD'); + } + } + print "$ret\n"; |