From b36d31030be202830cc21e29ec2fd3aaedbc1ea3 Mon Sep 17 00:00:00 2001 From: Bruce Momjian <bruce@momjian.us> Date: Fri, 16 Jun 2000 18:59:30 +0000 Subject: [PATCH] Cleanup README Makefile installs. --- contrib/array/Makefile | 6 ++-- contrib/earthdistance/Makefile | 6 ++-- contrib/findoidjoins/Makefile | 6 ++-- contrib/fulltextindex/Makefile | 6 ++-- contrib/isbn_issn/Makefile | 6 ++-- contrib/likeplanning/Makefile | 43 --------------------------- contrib/likeplanning/README | 44 ---------------------------- contrib/likeplanning/disablelike.sql | 39 ------------------------ contrib/likeplanning/enablelike.sql | 39 ------------------------ contrib/lo/Makefile | 6 ++-- contrib/mSQL-interface/Makefile | 6 ++-- contrib/miscutil/Makefile | 6 ++-- contrib/noupdate/Makefile | 6 ++-- contrib/pg_dumplo/Makefile | 8 ++--- contrib/pgbench/Makefile | 6 ++-- contrib/soundex/Makefile | 6 ++-- contrib/spi/Makefile | 8 ++--- contrib/string/Makefile | 6 ++-- contrib/tips/Makefile | 8 ++--- contrib/userlock/Makefile | 6 ++-- contrib/vacuumlo/Makefile | 6 ++-- 21 files changed, 54 insertions(+), 219 deletions(-) delete mode 100644 contrib/likeplanning/Makefile delete mode 100644 contrib/likeplanning/README delete mode 100644 contrib/likeplanning/disablelike.sql delete mode 100644 contrib/likeplanning/enablelike.sql diff --git a/contrib/array/Makefile b/contrib/array/Makefile index 04d785da72..199ed1d131 100644 --- a/contrib/array/Makefile +++ b/contrib/array/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.8 2000/06/15 18:54:31 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.9 2000/06/16 18:58:25 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = array_iterator PROGRAM = OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = $(NAME).sql BINS = EXAMPLES= @@ -29,7 +29,7 @@ install: install_doc install_sql install_mod install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file (CONTRIB_DOCDIR)/$(DOCS).$(NAME) ; \ done install_sql: diff --git a/contrib/earthdistance/Makefile b/contrib/earthdistance/Makefile index 37bfb5df31..21156347cf 100644 --- a/contrib/earthdistance/Makefile +++ b/contrib/earthdistance/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.2 2000/06/15 18:54:46 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.3 2000/06/16 18:58:26 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = earthdistance PROGRAM = OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = $(NAME).sql BINS = EXAMPLES= @@ -29,7 +29,7 @@ install: install_doc install_sql install_mod install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_sql: diff --git a/contrib/findoidjoins/Makefile b/contrib/findoidjoins/Makefile index 5b2377bf82..4990bfbdaa 100644 --- a/contrib/findoidjoins/Makefile +++ b/contrib/findoidjoins/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.5 2000/06/15 18:54:49 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.6 2000/06/16 18:58:29 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = findoidjoins PROGRAM = $(NAME) OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = BINS = $(PROGRAM) make_oidjoins_check EXAMPLES= @@ -31,7 +31,7 @@ install: install_doc nstall_bin install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_bin: diff --git a/contrib/fulltextindex/Makefile b/contrib/fulltextindex/Makefile index a417b4a2bf..caa9a26e2d 100644 --- a/contrib/fulltextindex/Makefile +++ b/contrib/fulltextindex/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.3 2000/06/15 18:54:51 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.4 2000/06/16 18:58:32 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = fti PROGRAM = OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = $(NAME).sql BINS = fti.pl EXAMPLES= @@ -29,7 +29,7 @@ install: install_doc install_sql install_mod install_bin install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_sql: diff --git a/contrib/isbn_issn/Makefile b/contrib/isbn_issn/Makefile index 36ef6a5aa2..814c52be48 100644 --- a/contrib/isbn_issn/Makefile +++ b/contrib/isbn_issn/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.3 2000/06/15 18:54:53 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.4 2000/06/16 18:58:46 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = isbn_issn PROGRAM = OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = $(NAME).sql BINS = EXAMPLES= @@ -30,7 +30,7 @@ install: install_doc install_sql install_mod install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_sql: diff --git a/contrib/likeplanning/Makefile b/contrib/likeplanning/Makefile deleted file mode 100644 index 2c779ac8aa..0000000000 --- a/contrib/likeplanning/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# $Header: /cvsroot/pgsql/contrib/likeplanning/Attic/Makefile,v 1.1 2000/06/15 19:04:56 momjian Exp $ -# - -TOPDIR=../.. - -include ../Makefile.global - -NAME = - -PROGRAM = -OBJS = -DOCS = likeplanning.doc -SQLS = disablelike.sql enablelike.sql -BINS = -EXAMPLES= -MODS = - -OTHER_CLEAN = - -all:: - -install: install_doc install_sql - -install_doc: - for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ - done - -install_sql: - for inst_file in $(SQLS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \ - done - -depend dep: - $(CC) -MM -MG $(CFLAGS) *.c > depend - -clean: - $(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log - -ifeq (depend,$(wildcard depend)) -include depend -endif diff --git a/contrib/likeplanning/README b/contrib/likeplanning/README deleted file mode 100644 index 0896966376..0000000000 --- a/contrib/likeplanning/README +++ /dev/null @@ -1,44 +0,0 @@ -This directory contains two SQL scripts that control use of some new -code for planning/optimizing queries containing LIKE and -regular-expression operators. This code was added to Postgres 7.0 late in -beta test, and it hasn't gotten enough testing to warrant turning it on by -default in release 7.0 (although it probably will become default in 7.1). -So, here are some scripts to enable and disable it. You may want to run -these scripts if you have problems with the planner choosing bad plans for -queries involving LIKE or regexps in WHERE clauses. - - -HOW TO USE THE SCRIPTS ----------------------- - -Both scripts must be run as the Postgres superuser. The easiest -way to run an SQL script is - psql -f scriptfile databasename -or you can start psql interactively and enter - \i scriptfile - -enablelike.sql enables use of the new planning code in the database in -which it is run. If you run it in template1, all subsequently-created -databases will use the new code by default. - -disablelike.sql reverts to the old planning code for LIKE, in the database -in which it is run. If you run it in template1, all subsequently-created -databases will use the old code by default. - - -WHAT IT DOES ------------- - -These scripts install (or disable) new code for "selectivity estimation" -of LIKE and regexp operators. Selectivity estimation determines the -estimated number of rows produced by a query or subquery, and that in turn -determines the kind of plan the planner will use. The old selectivity -estimator ignored the pattern being searched for and just produced the -same estimate as for an "=" operator, which of course was usually too low -for a wildcard match. The new code has some knowledge of pattern matching -rules and generates an estimate based on the number of fixed characters and -wildcards present in the pattern. Also, if the pattern has a fixed prefix -that must be matched (such as LIKE 'foo%' or ~ '^foo'), an appropriate -range-query selectivity estimate is produced and factored into the result. - -If you want to look at the code itself, see src/backend/utils/adt/selfuncs.c. diff --git a/contrib/likeplanning/disablelike.sql b/contrib/likeplanning/disablelike.sql deleted file mode 100644 index 353f9dd67b..0000000000 --- a/contrib/likeplanning/disablelike.sql +++ /dev/null @@ -1,39 +0,0 @@ --- This script disables use of the new LIKE-related selectivity estimation --- functions, which are a little too new to be enabled by default in 7.0. --- You can enable them again by running enablelike.sql. - --- Use of the functions will be disabled only in those databases you --- run this script in. If you run it in template1, --- all subsequently-created databases will not use the functions. - --- Be sure to run the script as the Postgres superuser! - -UPDATE pg_operator SET - oprrest = 'eqsel'::regproc, - oprjoin = 'eqjoinsel'::regproc -WHERE oprrest = 'regexeqsel'::regproc; - -UPDATE pg_operator SET - oprrest = 'eqsel'::regproc, - oprjoin = 'eqjoinsel'::regproc -WHERE oprrest = 'icregexeqsel'::regproc; - -UPDATE pg_operator SET - oprrest = 'eqsel'::regproc, - oprjoin = 'eqjoinsel'::regproc -WHERE oprrest = 'likesel'::regproc; - -UPDATE pg_operator SET - oprrest = 'neqsel'::regproc, - oprjoin = 'neqjoinsel'::regproc -WHERE oprrest = 'regexnesel'::regproc; - -UPDATE pg_operator SET - oprrest = 'neqsel'::regproc, - oprjoin = 'neqjoinsel'::regproc -WHERE oprrest = 'icregexnesel'::regproc; - -UPDATE pg_operator SET - oprrest = 'neqsel'::regproc, - oprjoin = 'neqjoinsel'::regproc -WHERE oprrest = 'nlikesel'::regproc; diff --git a/contrib/likeplanning/enablelike.sql b/contrib/likeplanning/enablelike.sql deleted file mode 100644 index efccacdf83..0000000000 --- a/contrib/likeplanning/enablelike.sql +++ /dev/null @@ -1,39 +0,0 @@ --- This script enables use of the new LIKE-related selectivity estimation --- functions, which are a little too new to be enabled by default in 7.0. --- You can disable them again by running disablelike.sql. - --- Use of the functions will be enabled only in those databases you --- run this script in. If you run it in template1, --- all subsequently-created databases will use the functions. - --- Be sure to run the script as the Postgres superuser! - -UPDATE pg_operator SET - oprrest = 'regexeqsel'::regproc, - oprjoin = 'regexeqjoinsel'::regproc -WHERE oprrest = 'eqsel'::regproc AND oprname = '~'; - -UPDATE pg_operator SET - oprrest = 'icregexeqsel'::regproc, - oprjoin = 'icregexeqjoinsel'::regproc -WHERE oprrest = 'eqsel'::regproc AND oprname = '~*'; - -UPDATE pg_operator SET - oprrest = 'likesel'::regproc, - oprjoin = 'likejoinsel'::regproc -WHERE oprrest = 'eqsel'::regproc AND oprname = '~~'; - -UPDATE pg_operator SET - oprrest = 'regexnesel'::regproc, - oprjoin = 'regexnejoinsel'::regproc -WHERE oprrest = 'neqsel'::regproc AND oprname = '!~'; - -UPDATE pg_operator SET - oprrest = 'icregexnesel'::regproc, - oprjoin = 'icregexnejoinsel'::regproc -WHERE oprrest = 'neqsel'::regproc AND oprname = '!~*'; - -UPDATE pg_operator SET - oprrest = 'nlikesel'::regproc, - oprjoin = 'nlikejoinsel'::regproc -WHERE oprrest = 'neqsel'::regproc AND oprname = '!~~'; diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile index ed6f9c92b3..08bff07b84 100644 --- a/contrib/lo/Makefile +++ b/contrib/lo/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.3 2000/06/15 18:54:56 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.4 2000/06/16 18:58:49 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = lo PROGRAM = OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = $(NAME).sql BINS = EXAMPLES= @@ -35,7 +35,7 @@ install: install_doc install_sql install_mod install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_sql: diff --git a/contrib/mSQL-interface/Makefile b/contrib/mSQL-interface/Makefile index b5dbd38229..4dc20f5204 100644 --- a/contrib/mSQL-interface/Makefile +++ b/contrib/mSQL-interface/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.1 2000/06/15 19:05:03 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.2 2000/06/16 18:58:54 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = mpgsql PROGRAM = OBJS = -DOCS = $(NAME).doc $(NAME).c +DOCS = README $(NAME).c SQLS = BINS = EXAMPLES= @@ -24,7 +24,7 @@ install: install_doc install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done clean: diff --git a/contrib/miscutil/Makefile b/contrib/miscutil/Makefile index 38118a6f8e..313772640d 100644 --- a/contrib/miscutil/Makefile +++ b/contrib/miscutil/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.8 2000/06/15 18:55:01 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.9 2000/06/16 18:58:55 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = misc_utils PROGRAM = OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = $(NAME).sql BINS = EXAMPLES= @@ -29,7 +29,7 @@ install: install_doc install_sql install_mod install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_sql: diff --git a/contrib/noupdate/Makefile b/contrib/noupdate/Makefile index 8536e21ceb..dd21ec1fdf 100644 --- a/contrib/noupdate/Makefile +++ b/contrib/noupdate/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.1 2000/06/15 19:05:04 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.2 2000/06/16 18:59:01 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = noup PROGRAM = OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = $(NAME).sql BINS = EXAMPLES= @@ -29,7 +29,7 @@ install: install_doc install_sql install_mod install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_sql: diff --git a/contrib/pg_dumplo/Makefile b/contrib/pg_dumplo/Makefile index 0432e7308b..a038d2925a 100644 --- a/contrib/pg_dumplo/Makefile +++ b/contrib/pg_dumplo/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.2 2000/06/15 18:55:10 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.3 2000/06/16 18:59:02 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = pg_dumplo PROGRAM = $(NAME) OBJS = main.o lo_export.o lo_import.o utils.o -DOCS = $(NAME).doc +DOCS = README SQLS = BINS = $(PROGRAM) EXAMPLES= @@ -29,7 +29,7 @@ install: install_doc install_bin install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_bin: @@ -47,4 +47,4 @@ ifeq (depend,$(wildcard depend)) include depend endif - \ No newline at end of file + diff --git a/contrib/pgbench/Makefile b/contrib/pgbench/Makefile index 60182ca831..6c1246969b 100644 --- a/contrib/pgbench/Makefile +++ b/contrib/pgbench/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.2 2000/06/15 18:55:12 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.3 2000/06/16 18:59:07 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = pgbench PROGRAM = $(NAME) OBJS = $(NAME).o -DOCS = $(NAME).doc $(NAME)_jis.doc +DOCS = README README.jis SQLS = BINS = $(PROGRAM) EXAMPLES= @@ -29,7 +29,7 @@ install: install_doc install_bin install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_bin: diff --git a/contrib/soundex/Makefile b/contrib/soundex/Makefile index 57157b8e98..bf9a0bf7bb 100644 --- a/contrib/soundex/Makefile +++ b/contrib/soundex/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/soundex/Attic/Makefile,v 1.3 2000/06/15 18:55:15 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/soundex/Attic/Makefile,v 1.4 2000/06/16 18:59:13 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = soundex PROGRAM = OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = $(NAME).sql BINS = EXAMPLES= @@ -30,7 +30,7 @@ install: install_doc install_sql install_mod install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_sql: diff --git a/contrib/spi/Makefile b/contrib/spi/Makefile index efc99a5df9..1922d4be68 100644 --- a/contrib/spi/Makefile +++ b/contrib/spi/Makefile @@ -1,16 +1,16 @@ # -# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.13 2000/06/15 18:55:17 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.14 2000/06/16 18:59:17 momjian Exp $ # TOPDIR=../.. include ../Makefile.global -NAME = +NAME = spi PROGRAM = OBJS = autoinc.o insert_username.o moddatetime.o refint.o timetravel.o -DOCS = spi.doc +DOCS = README SQLS = $(OBJS:.o=.sql) BINS = EXAMPLES= $(OBJS:.o=.example) @@ -33,7 +33,7 @@ install: install_doc install_sql install_mod install_example install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_sql: diff --git a/contrib/string/Makefile b/contrib/string/Makefile index 39254cf52b..9c727b638a 100644 --- a/contrib/string/Makefile +++ b/contrib/string/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.8 2000/06/15 18:55:21 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.9 2000/06/16 18:59:21 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = string_io PROGRAM = OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = $(NAME).sql BINS = EXAMPLES= @@ -30,7 +30,7 @@ install: install_doc install_sql install_mod install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_sql: diff --git a/contrib/tips/Makefile b/contrib/tips/Makefile index 4ad5db146d..f21212d97c 100644 --- a/contrib/tips/Makefile +++ b/contrib/tips/Makefile @@ -1,16 +1,16 @@ # -# $Header: /cvsroot/pgsql/contrib/tips/Attic/Makefile,v 1.1 2000/06/15 19:05:17 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/tips/Attic/Makefile,v 1.2 2000/06/16 18:59:25 momjian Exp $ # TOPDIR=../.. include ../Makefile.global -NAME = +NAME = apachelog PROGRAM = OBJS = -DOCS = apachelog.doc +DOCS = README SQLS = BINS = EXAMPLES= @@ -22,7 +22,7 @@ install: install_doc install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done clean: diff --git a/contrib/userlock/Makefile b/contrib/userlock/Makefile index 35f748e7c2..cd97f93366 100644 --- a/contrib/userlock/Makefile +++ b/contrib/userlock/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.8 2000/06/15 18:55:28 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.9 2000/06/16 18:59:28 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = user_locks PROGRAM = OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = $(NAME).sql BINS = EXAMPLES= @@ -29,7 +29,7 @@ install: install_doc install_sql install_mod install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_sql: diff --git a/contrib/vacuumlo/Makefile b/contrib/vacuumlo/Makefile index 1e67847b5a..88fd8cfb7e 100644 --- a/contrib/vacuumlo/Makefile +++ b/contrib/vacuumlo/Makefile @@ -1,5 +1,5 @@ # -# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.3 2000/06/15 18:55:31 momjian Exp $ +# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.4 2000/06/16 18:59:30 momjian Exp $ # TOPDIR=../.. @@ -10,7 +10,7 @@ NAME = vacuumlo PROGRAM = $(NAME) OBJS = $(NAME).o -DOCS = $(NAME).doc +DOCS = README SQLS = BINS = $(PROGRAM) EXAMPLES= @@ -29,7 +29,7 @@ install: install_doc install_bin install_doc: for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ + $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/$(DOCS).$(NAME); \ done install_bin: -- 2.50.0