1--- a/src/common/config_info.c
2+++ b/src/common/config_info.c
3@@ -118,7 +118,7 @@
4 i++;
5
6 configdata[i].name = pstrdup("PGXS");
7+ strlcpy(path, "@dev@/lib", sizeof(path));
8- get_pkglib_path(my_exec_path, path);
9 strlcat(path, "/pgxs/src/makefiles/pgxs.mk", sizeof(path));
10 cleanup_path(path);
11 configdata[i].setting = pstrdup(path);
12--- a/src/Makefile.global.in
13+++ b/src/Makefile.global.in
14@@ -116,7 +116,7 @@ endif
15
16 libdir := @libdir@
17
18-pkglibdir = $(libdir)
19+pkglibdir = @out@/lib
20 ifeq "$(findstring pgsql, $(pkglibdir))" ""
21 ifeq "$(findstring postgres, $(pkglibdir))" ""
22 override pkglibdir := $(pkglibdir)/postgresql