diff options
| author |  waker <wakeroid@gmail.com> | 2012-10-05 17:46:33 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-10-05 17:46:33 +0200 |
| commit | ce2923c8f0cac7a563d1ecf22085ac62281c74d7 (patch) | |
| tree | 20ce1a2fd0cebc36231882b011e34230778a1db9 /tools/apbuild/apgcc | |
| parent | 527ba48d8209a8e854c791d571106a5daf2fdd29 (diff) | |
| parent | 708c8ba9f7aefe9f795c9c4eb30ab128f09c8b3d (diff) | |
Merge branch 'master' into devel
Conflicts:
README
configure.ac
deadbeef.h
plugins.c
plugins/gtkui/Makefile.am
plugins/gtkui/ddbcellrenderertextmultiline.c
plugins/gtkui/ddblistview.c
plugins/gtkui/deadbeef.glade
plugins/gtkui/gtkui.c
plugins/gtkui/interface.c
plugins/gtkui/plcommon.c
plugins/shellexec/shellexec.c
plugins/supereq/Makefile.am
Diffstat (limited to 'tools/apbuild/apgcc')
| -rwxr-xr-x | tools/apbuild/apgcc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/apbuild/apgcc b/tools/apbuild/apgcc index 2aba0071..ddda846b 100755 --- a/tools/apbuild/apgcc +++ b/tools/apbuild/apgcc @@ -19,7 +19,6 @@ use Apbuild::Utils; # Don't forget to bump the version in Makefile too. our $APBUILD_VERSION = "2.0.9"; - ######## Initialization ######## # In C mode: @@ -75,7 +74,7 @@ if (!defined $appath) { $appath =~ s/\/*$//g; $appath =~ s/^(.*)\/.*?$/$1/; $appath .= '/include/apbuild'; - if (! -f "$appath/apsymbols.h" && -f "$FindBin::Bin/apsymbols.h") { + if (! -f "$appath/apsymbols.h.i686" && -f "$FindBin::Bin/apsymbols.h.i686") { $appath = $FindBin::Bin; } } |