Wrong order of include directories for GDB 5.0 compiles on Solaris 2.7

[ulairi]

Architecture: sparc-sun-solaris2.7
 

Compiler: gcc-2.95.3 20010315 (release)

uname -a: SunOS [HostNameDeleted] 5.7 Generic_106541-04 sun4u sparc SUNW,Ultra-
5_10

Configure flags:
./configure \
--prefix=/usr2/GDB_5.0 \
--libdir=/usr2/lib \
--includedir=/usr2/include \
--mandir=/usr2/man 

Problem:
When trying to run "gmake", get the following error:
gcc -c -DHAVE_CONFIG_H -I/usr2/include -I/usr/openwin/share/include -
I/usr/openwin/include -I/usr/dt/share/include -I/usr/dt/include -
I/usr/java1.1/include -I/usr/local/include -I. -I./../include  -W -Wall -
Wtraditional  fnmatch.c -o pic/fnmatch.o
gcc -c -DHAVE_CONFIG_H -I/usr2/include -I/usr/openwin/share/include -
I/usr/openwin/include -I/usr/dt/share/include -I/usr/dt/include -
I/usr/java1.1/include -I/usr/local/include -I. -I./../include  -W -Wall -
Wtraditional fnmatch.c
fnmatch.c: In function `fnmatch':
fnmatch.c:82: `FNM_CASEFOLD' undeclared (first use in this function)
fnmatch.c:82: (Each undeclared identifier is reported only once
fnmatch.c:82: for each function it appears in.)
fnmatch.c:89: `FNM_FILE_NAME' undeclared (first use in this function)
fnmatch.c:218: `FNM_LEADING_DIR' undeclared (first use in this function)
gmake[1]: *** [fnmatch.o] Error 1
gmake[1]: Leaving directory `/usr2/sources/GNU/GDB/gdb-5.0/libiberty'
gmake: *** [all-libiberty] Error 2


Problem cause: fnmatch.h in /usr/include (Sun-supplied) does not have the 
correct function prototypes, and the fnmatch.h in ./../include, which does have 
the correct prototypes is never used because -I./../include is after the 
$CPPFLAGS (which includes /usr/include).

Fix: 
diff ./libiberty/Makefile.in ./libiberty/Makefile.in.broken
109c109
< COMPILE.c = $(CC) -c @DEFS@ -I. -I$(INCDIR) $(LIBCFLAGS) $(HDEFINES) 
@ac_libiberty_warn_cflags@
---
> COMPILE.c = $(CC) -c @DEFS@ $(LIBCFLAGS) -I. -I$(INCDIR) $(HDEFINES) 
@ac_libiberty_warn_cflags@