BUG #6045: Compilation of contribs fail

The following bug has been logged online:

Bug reference:      6045
Logged by:          Emanuel
Email address:      postgres.arg@gmail.com
PostgreSQL version: 9.1beta
Operating system:   Ubuntu 10.04 2.6.31
Description:        Compilation of contribs fail
Details:

make and make installs work well. To compile correctly I must hardcode the
libdir. I happens with several contribs.

root@dell-desktop:/home/ecalvo-laptop/postgresql-9.1beta1/contrib/pgstattupl
e# /usr/local/pgsql/bin/psql -Upostgres < pgstattuple--1.0.sql
ERROR:  could not access file "MODULE_PATHNAME": No existe el archivo o
directorio
ERROR:  could not access file "MODULE_PATHNAME": No existe el archivo o
directorio
ERROR:  could not access file "MODULE_PATHNAME": No existe el archivo o
directorio
ERROR:  could not access file "MODULE_PATHNAME": No existe el archivo o
directorio

##### ECHO .control
root@dell-desktop:/home/ecalvo-laptop/postgresql-9.1beta1/contrib/pgstattupl
e# cat pgstattuple.control
# pgstattuple extension
comment = 'show tuple-level statistics'
default_version = '1.0'
module_pathname = '$libdir/pgstattuple'
relocatable = true

##### PG_CONFIG LIBDIR location
root@dell-desktop:/home/ecalvo-laptop/postgresql-9.1beta1/contrib/pgstattupl
e# /usr/local/pgsql/bin/pg_config | grep -i libdir
LIBDIR = /usr/local/pgsql/lib
PKGLIBDIR = /usr/local/pgsql/lib


#### Content of sql:
root@dell-desktop:/home/ecalvo-laptop/postgresql-9.1beta1/contrib/pgstattupl
e# grep -i MODULE pgstattuple--1.0.sql
AS 'MODULE_PATHNAME', 'pgstattuple'
AS 'MODULE_PATHNAME', 'pgstattuplebyid'
AS 'MODULE_PATHNAME', 'pgstatindex'
AS 'MODULE_PATHNAME', 'pg_relpages'

Seems that it didn't replace the correct MODULE_PATHNAME with
$libdir/contrib...