Re: tsearch2 makefile fixes

As I can see, this patch already apllyed at 18 Oct:
% grep subdir */Makefile
ispell/Makefile:subdir = contrib/tsearch2/ispell
snowball/Makefile:subdir = contrib/tsearch2/snowball
wordparser/Makefile:subdir = contrib/tsearch2/wordparser

CVS HEAD

Alvaro Herrera wrote:
> [Resend, this time with the patch attached]
>
> Hi,
>
> I needed to apply this patch in order for tsearch2 to build here. This
> is a VPATH build, so maybe it's a reason why it's not a common test
> scenario. The changes itself also seem sound to me, at least as far as
> I understand our makefile structure.
>
> Please consider applying this to 8.1 (or just let me know and I'll do it
> for you).
>
>
>
> ------------------------------------------------------------------------
>
> Index: ispell/Makefile
> ===================================================================
> RCS file: /home/alvherre/Code/cvs/pgsql/contrib/tsearch2/ispell/Makefile,v
> retrieving revision 1.8
> diff -c -r1.8 Makefile
> *** ispell/Makefile 27 Sep 2005 17:13:11 -0000 1.8
> --- ispell/Makefile 2 Nov 2005 09:56:58 -0000
> ***************
> *** 8,14 ****
> PGXS := $(shell pg_config --pgxs)
> include $(PGXS)
> else
> ! subdir = contrib/tsearch2
> top_builddir = ../../..
> include $(top_builddir)/src/Makefile.global
> include $(top_srcdir)/contrib/contrib-global.mk
> --- 8,14 ----
> PGXS := $(shell pg_config --pgxs)
> include $(PGXS)
> else
> ! subdir = contrib/tsearch2/ispell
> top_builddir = ../../..
> include $(top_builddir)/src/Makefile.global
> include $(top_srcdir)/contrib/contrib-global.mk
> Index: snowball/Makefile
> ===================================================================
> RCS file: /home/alvherre/Code/cvs/pgsql/contrib/tsearch2/snowball/Makefile,v
> retrieving revision 1.7
> diff -c -r1.7 Makefile
> *** snowball/Makefile 27 Sep 2005 17:13:12 -0000 1.7
> --- snowball/Makefile 2 Nov 2005 09:53:41 -0000
> ***************
> *** 9,15 ****
> PGXS := $(shell pg_config --pgxs)
> include $(PGXS)
> else
> ! subdir = contrib/tsearch2
> top_builddir = ../../..
> include $(top_builddir)/src/Makefile.global
> include $(top_srcdir)/contrib/contrib-global.mk
> --- 9,15 ----
> PGXS := $(shell pg_config --pgxs)
> include $(PGXS)
> else
> ! subdir = contrib/tsearch2/snowball
> top_builddir = ../../..
> include $(top_builddir)/src/Makefile.global
> include $(top_srcdir)/contrib/contrib-global.mk
> Index: wordparser/Makefile
> ===================================================================
> RCS file: /home/alvherre/Code/cvs/pgsql/contrib/tsearch2/wordparser/Makefile,v
> retrieving revision 1.7
> diff -c -r1.7 Makefile
> *** wordparser/Makefile 27 Sep 2005 17:13:12 -0000 1.7
> --- wordparser/Makefile 2 Nov 2005 09:54:30 -0000
> ***************
> *** 9,15 ****
> PGXS := $(shell pg_config --pgxs)
> include $(PGXS)
> else
> ! subdir = contrib/tsearch2
> top_builddir = ../../..
> include $(top_builddir)/src/Makefile.global
> include $(top_srcdir)/contrib/contrib-global.mk
> --- 9,15 ----
> PGXS := $(shell pg_config --pgxs)
> include $(PGXS)
> else
> ! subdir = contrib/tsearch2/wordparser
> top_builddir = ../../..
> include $(top_builddir)/src/Makefile.global
> include $(top_srcdir)/contrib/contrib-global.mk

--
Teodor Sigaev E-mail: teodor(at)sigaev(dot)ru
WWW: http://www.sigaev.ru/