Remove cvs keywords from all files.

[postgresql] / src / backend / snowball / Makefile

diff --git a/src/backend/snowball/Makefile b/src/backend/snowball/Makefile
index f1d54eb0998ac09e54a3356a53adc8c0b176f4b6..054880866dc23616c3fcc78111dcb8839e91367e 100644 (file)
--- a/src/backend/snowball/Makefile
+++ b/src/backend/snowball/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/backend/snowball
 #
-# $PostgreSQL: pgsql/src/backend/snowball/Makefile,v 1.1 2007/08/21 01:11:15 tgl Exp $
+# src/backend/snowball/Makefile
 #
 #-------------------------------------------------------------------------
 
@@ -46,7 +46,10 @@ OBJS= dict_snowball.o api.o utilities.o \
        stem_UTF_8_swedish.o \
        stem_UTF_8_turkish.o
 
-# second column is name of latin dictionary, if different
+# first column is language name and also name of dictionary for not-all-ASCII
+# words, second is name of dictionary for all-ASCII words
+# Note order dependency: use of some other language as ASCII dictionary
+# must come after creation of that language
 LANGUAGES=  \
        danish          danish          \
        dutch           dutch           \
@@ -62,23 +65,15 @@ LANGUAGES=  \
        russian         english         \
        spanish         spanish         \
        swedish         swedish         \
-       turkish         turkish         \
+       turkish         turkish
 
 
 SQLSCRIPT= snowball_create.sql
 DICTDIR=tsearch_data
 
-ifdef VPATH
-override VPATH := $(srcdir)/libstemmer:$(VPATH)
-else
-VPATH = $(srcdir)/libstemmer
-endif
-
-SHLIB_LINK     := $(BE_DLLLIBS)
+VPATH += $(srcdir)/libstemmer
 
 NAME := dict_snowball
-SO_MAJOR_VERSION := 0
-SO_MINOR_VERSION := 0
 rpath =
 
 all: all-shared-lib $(SQLSCRIPT)
@@ -89,34 +84,34 @@ $(SQLSCRIPT): Makefile snowball_func.sql.in snowball.sql.in
 ifeq ($(enable_shared), yes)
        echo '-- Language-specific snowball dictionaries' > $@
        cat $(srcdir)/snowball_func.sql.in >> $@        
-       @set $(LANGUAGES) ; \
+       @set -e; \
+       set $(LANGUAGES) ; \
        while [ "$$#" -gt 0 ] ; \
        do \
                lang=$$1; shift; \
+               nonascdictname=$$lang; \
+               ascdictname=$$1; shift; \
                if [ -s $(srcdir)/stopwords/$${lang}.stop ] ; then \
                        stop=", StopWords=$${lang}" ; \
                else \
                        stop=""; \
                fi; \
-               nonlatdictname=$$lang; \
-               latdictname=$$1; shift; \
                cat $(srcdir)/snowball.sql.in | \
-                       sed -e "s#_DICTNAME_#$$lang#g" | \
+                       sed -e "s#_LANGNAME_#$$lang#g" | \
+                       sed -e "s#_DICTNAME_#$${lang}_stem#g" | \
                        sed -e "s#_CFGNAME_#$$lang#g" | \
-                       sed -e "s#_LATDICTNAME_#$$latdictname#g" | \
-                       sed -e "s#_NONLATDICTNAME_#$$nonlatdictname#g" | \
+                       sed -e "s#_ASCDICTNAME_#$${ascdictname}_stem#g" | \
+                       sed -e "s#_NONASCDICTNAME_#$${nonascdictname}_stem#g" | \
                        sed -e "s#_STOPWORDS_#$$stop#g" ; \
        done >> $@
 else
        echo "-- No language-specific snowball dictionaries, for lack of shared library support" > $@
 endif
 
-install: all installdirs
-ifeq ($(enable_shared), yes)
-       $(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)'
-endif
+install: all installdirs install-lib
        $(INSTALL_DATA) $(SQLSCRIPT) '$(DESTDIR)$(datadir)'
-       @set $(LANGUAGES) ; \
+       @set -e; \
+       set $(LANGUAGES) ; \
        while [ "$$#" -gt 0 ] ; \
        do \
                lang=$$1; shift; shift; \
@@ -125,13 +120,13 @@ endif
                fi \
        done
 
-installdirs:
-       $(mkinstalldirs) '$(DESTDIR)$(pkglibdir)' '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)'
+installdirs: installdirs-lib
+       $(MKDIR_P) '$(DESTDIR)$(datadir)' '$(DESTDIR)$(datadir)/$(DICTDIR)'
 
-uninstall:
-       rm -f '$(DESTDIR)$(pkglibdir)/$(NAME)$(DLSUFFIX)'
+uninstall: uninstall-lib
        rm -f '$(DESTDIR)$(datadir)/$(SQLSCRIPT)'
-       @set $(LANGUAGES) ; \
+       @set -e; \
+       set $(LANGUAGES) ; \
        while [ "$$#" -gt 0 ] ; \
        do \
                lang=$$1; shift; shift;  \