tags 537008 + patch
thanks

Patch attached. 

The included /usr/lib/postgresql/8.3/lib/pgxs/src/Makefile.global runs
the default "pg_config" which returns 8.4-related paths, resulting in
files being installed under debian/tmp/../8.4 (and probably spurious
links and dependencies if you have happen to have both 8.3 and 8.4
installed at the same time).

We thus export PG_CONFIG to the 8.3 version and--as a bonus--use this in
10_Makefile.patch to avoid duplication.


Regards,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      [email protected]
       `-
diff -urNd plr-8.3.0.6.orig/debian/patches/10_Makefile.patch 
plr-8.3.0.6/debian/patches/10_Makefile.patch
--- plr-8.3.0.6.orig/debian/patches/10_Makefile.patch   2009-07-27 
14:06:35.000000000 +0200
+++ plr-8.3.0.6/debian/patches/10_Makefile.patch        2009-07-27 
14:07:14.000000000 +0200
@@ -22,7 +22,7 @@
  
  ifdef USE_PGXS
 -PGXS := $(shell pg_config --pgxs)
-+PGXS := $(shell /usr/lib/postgresql/8.3/bin/pg_config --pgxs)
++PGXS := $(shell $(PG_CONFIG) --pgxs)
  include $(PGXS)
  else
  subdir = contrib/plr
diff -urNd plr-8.3.0.6.orig/debian/rules plr-8.3.0.6/debian/rules
--- plr-8.3.0.6.orig/debian/rules       2009-07-27 14:06:35.000000000 +0200
+++ plr-8.3.0.6/debian/rules    2009-07-27 14:06:53.000000000 +0200
@@ -8,7 +8,7 @@
 #SHLIB_LINK=-Wl,-rpath /usr/lib/R/lib
 #export LDFLAGS SHLIB_LINK
 
-DEB_MAKE_ENVVARS:=USE_PGXS=1
+DEB_MAKE_ENVVARS:=USE_PGXS=1 PG_CONFIG=/usr/lib/postgresql/8.3/bin/pg_config
 # Do not set R_HOME to force variable setting via pkg-config which leads to 
more
 # reasonable results regarding r_includespec
 # R_HOME=/usr/lib/R

Attachment: signature.asc
Description: PGP signature

Reply via email to