David Fetter wrote:
> On Sun, Jan 15, 2006 at 09:55:39PM -0800, David Fetter wrote:
> > On Mon, Jan 16, 2006 at 12:13:11AM -0500, Neil Conway wrote:
> > > On Sun, 2006-01-15 at 20:08 -0800, David Fetter wrote:
> > > >   
> > > >   ifdef USE_PGXS 
> > > 
> > > The change to $PostgreSQL$ is bogus (perhaps due to the way you
> > > setup cvsup?), as are all the other $PostgreSQL$ changes in the
> > > patch. Also, the patch doesn't actually add any files called
> > > "uninstall.sql".
> > 
> > Oops.  My FM R'ing skills need some work.  This patch includes the
> > files.
> 
> Next: naming files so they don't clobber each other.

I have updated your patch to remove the $PostgreSQL$ tags, but I still
do not see the uninstall files in the patch.

-- 
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073
Index: contrib/btree_gist/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/btree_gist/Makefile,v
retrieving revision 1.8
diff -c -c -r1.8 Makefile
*** contrib/btree_gist/Makefile 27 Sep 2005 17:12:59 -0000      1.8
--- contrib/btree_gist/Makefile 12 Feb 2006 04:36:55 -0000
***************
*** 7,12 ****
--- 7,13 ----
                btree_bytea.o btree_bit.o btree_numeric.o
  
  DATA_built  = btree_gist.sql
+ DATA        = uninstall_btree_gist.sql
  DOCS        = README.btree_gist
  
  REGRESS     = init int2 int4 int8 float4 float8 cash oid timestamp 
timestamptz time timetz \
Index: contrib/chkpass/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/chkpass/Makefile,v
retrieving revision 1.7
diff -c -c -r1.7 Makefile
*** contrib/chkpass/Makefile    27 Sep 2005 17:13:00 -0000      1.7
--- contrib/chkpass/Makefile    12 Feb 2006 04:36:55 -0000
***************
*** 4,9 ****
--- 4,10 ----
  OBJS = chkpass.o
  SHLIB_LINK = $(filter -lcrypt, $(LIBS))
  DATA_built = chkpass.sql
+ DATA = uninstall_chkpass.sql
  DOCS = README.chkpass
  
  ifdef USE_PGXS
Index: contrib/cube/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/cube/Makefile,v
retrieving revision 1.15
diff -c -c -r1.15 Makefile
*** contrib/cube/Makefile       18 Oct 2005 01:30:48 -0000      1.15
--- contrib/cube/Makefile       12 Feb 2006 04:36:55 -0000
***************
*** 4,9 ****
--- 4,10 ----
  OBJS= cube.o cubeparse.o
  
  DATA_built = cube.sql
+ DATA = uninstall_cube.sql
  DOCS = README.cube
  REGRESS = cube
  
Index: contrib/dblink/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/dblink/Makefile,v
retrieving revision 1.10
diff -c -c -r1.10 Makefile
*** contrib/dblink/Makefile     27 Sep 2005 17:13:01 -0000      1.10
--- contrib/dblink/Makefile     12 Feb 2006 04:36:55 -0000
***************
*** 6,11 ****
--- 6,12 ----
  SHLIB_LINK = $(libpq)
  
  DATA_built = dblink.sql 
+ DATA = uninstall_dblink.sql 
  DOCS = README.dblink
  REGRESS = dblink
  
Index: contrib/earthdistance/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/earthdistance/Makefile,v
retrieving revision 1.16
diff -c -c -r1.16 Makefile
*** contrib/earthdistance/Makefile      27 Sep 2005 17:13:02 -0000      1.16
--- contrib/earthdistance/Makefile      12 Feb 2006 04:36:55 -0000
***************
*** 2,7 ****
--- 2,8 ----
  
  MODULES = earthdistance
  DATA_built = earthdistance.sql
+ DATA = uninstall_earthdistance.sql
  DOCS = README.earthdistance
  REGRESS = earthdistance
  
Index: contrib/fuzzystrmatch/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/fuzzystrmatch/Makefile,v
retrieving revision 1.6
diff -c -c -r1.6 Makefile
*** contrib/fuzzystrmatch/Makefile      27 Sep 2005 17:13:03 -0000      1.6
--- contrib/fuzzystrmatch/Makefile      12 Feb 2006 04:36:55 -0000
***************
*** 4,9 ****
--- 4,10 ----
  SRCS += fuzzystrmatch.c dmetaphone.c
  OBJS = $(SRCS:.c=.o)
  DATA_built = fuzzystrmatch.sql
+ DATA = uninstall_fuzzystrmatch.sql
  DOCS = README.fuzzystrmatch README.soundex
  
  ifdef USE_PGXS
Index: contrib/intagg/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/intagg/Makefile,v
retrieving revision 1.6
diff -c -c -r1.6 Makefile
*** contrib/intagg/Makefile     27 Sep 2005 17:13:03 -0000      1.6
--- contrib/intagg/Makefile     12 Feb 2006 04:36:55 -0000
***************
*** 6,11 ****
--- 6,12 ----
  
  MODULES = int_aggregate
  DATA_built = int_aggregate.sql
+ DATA = uninstall_int_aggregate.sql
  DOCS = README.int_aggregate
  
  ifdef USE_PGXS
Index: contrib/intarray/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/intarray/Makefile,v
retrieving revision 1.12
diff -c -c -r1.12 Makefile
*** contrib/intarray/Makefile   27 Sep 2005 17:13:04 -0000      1.12
--- contrib/intarray/Makefile   12 Feb 2006 04:36:55 -0000
***************
*** 3,8 ****
--- 3,9 ----
  MODULE_big = _int
  OBJS = _int_bool.o _int_gist.o _int_op.o _int_tool.o _intbig_gist.o 
  DATA_built = _int.sql
+ DATA = uninstall__int.sql
  DOCS = README.intarray
  REGRESS = _int
  
Index: contrib/isbn_issn/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/isbn_issn/Makefile,v
retrieving revision 1.14
diff -c -c -r1.14 Makefile
*** contrib/isbn_issn/Makefile  27 Sep 2005 17:13:04 -0000      1.14
--- contrib/isbn_issn/Makefile  12 Feb 2006 04:36:55 -0000
***************
*** 2,7 ****
--- 2,8 ----
  
  MODULES = isbn_issn
  DATA_built = isbn_issn.sql
+ DATA = uninstall_isbn_issn.sql
  DOCS = README.isbn_issn
  
  ifdef USE_PGXS
Index: contrib/ltree/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/ltree/Makefile,v
retrieving revision 1.4
diff -c -c -r1.4 Makefile
*** contrib/ltree/Makefile      27 Sep 2005 17:13:05 -0000      1.4
--- contrib/ltree/Makefile      12 Feb 2006 04:36:55 -0000
***************
*** 3,8 ****
--- 3,9 ----
  OBJS =        ltree_io.o ltree_op.o lquery_op.o _ltree_op.o crc32.o \
        ltxtquery_io.o ltxtquery_op.o ltree_gist.o _ltree_gist.o
  DATA_built = ltree.sql
+ DATA = uninstall_ltree.sql
  DOCS = README.ltree
  REGRESS = ltree
  
Index: contrib/pg_buffercache/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/pg_buffercache/Makefile,v
retrieving revision 1.2
diff -c -c -r1.2 Makefile
*** contrib/pg_buffercache/Makefile     27 Sep 2005 17:13:07 -0000      1.2
--- contrib/pg_buffercache/Makefile     12 Feb 2006 04:36:55 -0000
***************
*** 4,9 ****
--- 4,10 ----
  OBJS  = pg_buffercache_pages.o
  
  DATA_built = pg_buffercache.sql 
+ DATA = uninstall_pg_buffercache.sql 
  DOCS = README.pg_buffercache
  
  ifdef USE_PGXS
Index: contrib/pg_trgm/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/pg_trgm/Makefile,v
retrieving revision 1.3
diff -c -c -r1.3 Makefile
*** contrib/pg_trgm/Makefile    27 Sep 2005 17:13:07 -0000      1.3
--- contrib/pg_trgm/Makefile    12 Feb 2006 04:36:55 -0000
***************
*** 5,10 ****
--- 5,11 ----
  OBJS = trgm_op.o trgm_gist.o 
  
  DATA_built = pg_trgm.sql
+ DATA = uninstall_pg_trgm.sql
  DOCS = README.pg_trgm
  REGRESS = pg_trgm
  
Index: contrib/pgstattuple/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/pgstattuple/Makefile,v
retrieving revision 1.4
diff -c -c -r1.4 Makefile
*** contrib/pgstattuple/Makefile        27 Sep 2005 17:13:09 -0000      1.4
--- contrib/pgstattuple/Makefile        12 Feb 2006 04:36:55 -0000
***************
*** 12,17 ****
--- 12,18 ----
  OBJS          = $(SRCS:.c=.o)
  DOCS          = README.pgstattuple README.pgstattuple.euc_jp
  DATA_built    = pgstattuple.sql
+ DATA          = uninstall_pgstattuple.sql
  
  ifdef USE_PGXS
  PGXS := $(shell pg_config --pgxs)
Index: contrib/seg/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/seg/Makefile,v
retrieving revision 1.14
diff -c -c -r1.14 Makefile
*** contrib/seg/Makefile        18 Oct 2005 01:30:48 -0000      1.14
--- contrib/seg/Makefile        12 Feb 2006 04:36:56 -0000
***************
*** 3,8 ****
--- 3,9 ----
  MODULE_big = seg
  OBJS = seg.o segparse.o
  DATA_built = seg.sql
+ DATA = uninstall_seg.sql
  DOCS = README.seg
  REGRESS = seg
  
Index: contrib/tablefunc/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/tablefunc/Makefile,v
retrieving revision 1.5
diff -c -c -r1.5 Makefile
*** contrib/tablefunc/Makefile  27 Sep 2005 17:13:10 -0000      1.5
--- contrib/tablefunc/Makefile  12 Feb 2006 04:36:56 -0000
***************
*** 1,5 ****
--- 1,6 ----
  MODULES = tablefunc
  DATA_built = tablefunc.sql
+ DATA = uninstall_tablefunc.sql
  DOCS = README.tablefunc
  REGRESS = tablefunc
  
Index: contrib/userlock/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/userlock/Makefile,v
retrieving revision 1.19
diff -c -c -r1.19 Makefile
*** contrib/userlock/Makefile   27 Sep 2005 17:13:13 -0000      1.19
--- contrib/userlock/Makefile   12 Feb 2006 04:36:56 -0000
***************
*** 2,7 ****
--- 2,8 ----
  
  MODULES = user_locks
  DATA_built = user_locks.sql
+ DATA = uninstall_user_locks.sql
  DOCS = README.user_locks
  
  ifdef USE_PGXS
Index: contrib/xml2/Makefile
===================================================================
RCS file: /cvsroot/pgsql/contrib/xml2/Makefile,v
retrieving revision 1.6
diff -c -c -r1.6 Makefile
*** contrib/xml2/Makefile       27 Sep 2005 17:13:13 -0000      1.6
--- contrib/xml2/Makefile       12 Feb 2006 04:36:56 -0000
***************
*** 9,14 ****
--- 9,15 ----
  SHLIB_LINK = -lxml2 -lxslt
  
  DATA_built = pgxml.sql
+ DATA = uninstall_pgxml.sql
  DOCS = README.xml2
  
  override CFLAGS += $(shell xml2-config --cflags)
---------------------------(end of broadcast)---------------------------
TIP 9: In versions below 8.0, the planner will ignore your desire to
       choose an index scan if your joining column's datatypes do not
       match

Reply via email to