Skip to content

P
Postgres FD Implementation
Commit 74618e2b authored by Peter Eisentraut's avatar Peter Eisentraut
Browse files
Options

Another round of those unportable config/build changes :-/ 

* Add option to build with OpenSSL out of the box. Fix thusly exposed
  bit rot. Although it compiles now, getting this to do something
  useful is left as an exercise.

* Fix Kerberos options to defer checking for required libraries until
  all the other libraries are checked for.

* Change default odbcinst.ini and krb5.srvtab path to PREFIX/etc.

* Install work around for Autoconf's install-sh relative path anomaly.
  Get rid of old INSTL_*_OPTS variables, now that we don't need them
  anymore.

* Use `gunzip -c' instead of g?zcat. Reportedly broke on AIX.

* Look for only one of readline.h or readline/readline.h, not both.

* Make check for PS_STRINGS cacheable. Don't test for the header files
  separately.

* Disable fcntl(F_SETLK) test on Linux.

* Substitute the standard GCC warnings set into CFLAGS in configure,
  don't add it on in Makefile.global.

* Sweep through contrib tree to teach makefiles standard semantics.

... and in completely unrelated news:

* Make postmaster.opts arbitrary options-aware. I still think we need to
  save the environment as well.
parent b59c03f8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1801 additions and 1980 deletions
configure
View file @ 74618e2b
This source diff could not be displayed because it is too large. You can view the blob instead.
configure.in
View file @ 74618e2b
This diff is collapsed.
contrib/Makefile
View file @ 74618e2b
# #
# The PostgreSQL contrib tree Makefile # The PostgreSQL contrib tree Makefile
# #
# Portions Copyright (c) 1999-2000, PostgreSQL, Inc # $Header: /cvsroot/pgsql/contrib/Makefile,v 1.6 2000/07/09 13:12:57 petere Exp $
#
# $Header: /cvsroot/pgsql/contrib/Makefile,v 1.5 2000/06/19 13:52:59 momjian Exp $
# #
TOPDIR = .. subdir = contrib
include Makefile.global top_builddir = ..
include ../src/Makefile.global
WANTED_DIRS = array \ WANTED_DIRS = array \
earthdistance \ earthdistance \
...@@ -25,34 +24,22 @@ WANTED_DIRS = array \ ...@@ -25,34 +24,22 @@ WANTED_DIRS = array \
spi \ spi \
string \ string \
tips \ tips \
tools \
unixdate \ unixdate \
userlock \ userlock \
vacuumlo vacuumlo
# odbc # odbc
all .DEFAULT:
all:
for dir in $(WANTED_DIRS); do \ for dir in $(WANTED_DIRS); do \
if [ -e $$dir/Makefile ]; then \ if [ -e $$dir/Makefile ]; then \
$(MAKE) -C $$dir $@ ; \ $(MAKE) -C $$dir $@ ; \
fi; \ fi; \
done done
install: install:
../config/mkinstalldirs $(CONTRIB_BINDIR) $(CONTRIB_MODDIR) $(CONTRIB_DOCDIR) $(CONTRIB_SQLDIR) $(CONTRIB_EXAMPLESDIR)
for dir in $(WANTED_DIRS); do \
if [ -e $$dir/Makefile ]; then \
$(MAKE) -C $$dir $@ ; \
fi; \
done
$(INSTALL) $(INSTL_LIB_OPTS) Contrib.index $(CONTRIB_DOCDIR);
.DEFAULT:
for dir in $(WANTED_DIRS); do \ for dir in $(WANTED_DIRS); do \
if [ -e $$dir/Makefile ]; then \ if [ -e $$dir/Makefile ]; then \
$(MAKE) -C $$dir $@ ; \ $(MAKE) -C $$dir $@ ; \
fi; \ fi; \
done done
$(INSTALL_DATA) Contrib.index $(docdir)/contrib
contrib/Makefile.global deleted 100644 → 0
View file @ b59c03f8
#-------------------------------------------------------------------------
#
# Makefile.global
# Build and install PostgreSQL contrib.
#
# Portions Copyright (c) 1999-2000, PostgreSQL, Inc
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/contrib/Attic/Makefile.global,v 1.2 2000/06/19 13:52:59 momjian Exp $
#
#-------------------------------------------------------------------------
SRCDIR = $(TOPDIR)/src
include $(SRCDIR)/Makefile.global
### ---------------------------------------------------------
### DELETE THIS PART if ../src/Makefile.global is standardize
### (has define all next definitions itself)
DOCDIR=$(POSTDOCDIR)
# not $PGDATA, but anything like '/usr/local/pgsql/share'
DATADIR=$(LIBDIR)
### ----------------------------------------------------------
# execute-able
CONTRIB_BINDIR = $(BINDIR)
# *.so
CONTRIB_MODDIR = $(LIBDIR)/modules
# *.doc
CONTRIB_DOCDIR = $(DOCDIR)/contrib
# *.sql
CONTRIB_SQLDIR = $(DATADIR)/sql
# *.examples
CONTRIB_EXAMPLESDIR = $(CONTRIB_DOCDIR)/examples
RM = rm -f
SED = sed
contrib/array/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.11 2000/07/04 16:16:43 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/array/Attic/Makefile,v 1.12 2000/07/09 13:12:59 petere Exp $
# #
TOPDIR=../.. subdir = contrib/array
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := array_iterator
SONAME := $(NAME)$(DLSUFFIX)
NAME = array_iterator
PROGRAM =
OBJS = $(NAME).o
DOCS = README.$(NAME)
SQLS = $(NAME).sql
BINS =
EXAMPLES=
MODS = $(NAME)$(DLSUFFIX)
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
OTHER_CLEAN = $(SQLS) all: $(SONAME) $(NAME).sql
all: $(MODS) $(SQLS)
%.sql: %.sql.in $(NAME).sql: $(NAME).sql.in
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@ sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
install: install_doc install_sql install_mod install: all installdirs
$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
$(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib
install_doc: installdirs:
for inst_file in $(DOCS); do \ $(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir)/contrib
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_sql: uninstall:
for inst_file in $(SQLS); do \ rm -rf $(docdir)/contrib/README.$(NAME) $(datadir)/contrib/$(NAME).sql $(libdir)/contrib/$(SONAME)
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
done
install_mod:
for inst_file in $(MODS); do \
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
done
clean distclean maintainer-clean:
rm -f $(SONAME) $(NAME).sql
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/earthdistance/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.5 2000/07/04 16:16:44 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/earthdistance/Makefile,v 1.6 2000/07/09 13:13:00 petere Exp $
# #
TOPDIR=../.. subdir = contrib/earthdistance
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := earthdistance
SONAME := $(NAME)$(DLSUFFIX)
NAME = earthdistance
PROGRAM =
OBJS = $(NAME).o
DOCS = README.$(NAME)
SQLS = $(NAME).sql
BINS =
EXAMPLES=
MODS = $(NAME)$(DLSUFFIX)
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
OTHER_CLEAN = $(SQLS) all: $(SONAME) $(NAME).sql
all: $(MODS) $(SQLS) $(NAME).sql: $(NAME).sql.in
sed -e 's:MODULE_PATHNAME:$(datadir)/contrib/$(SONAME):g' < $< > $@
%.sql: %.sql.in install: all installdirs
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@ $(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib
$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
install: install_doc install_sql install_mod installdirs:
$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
install_doc: uninstall:
for inst_file in $(DOCS); do \ rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_sql: clean distclean maintainer-clean:
for inst_file in $(SQLS); do \ rm -f $(SONAME) $(NAME).sql
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
done
install_mod:
for inst_file in $(MODS); do \
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
done
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/findoidjoins/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.7 2000/06/19 13:53:22 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/findoidjoins/Attic/Makefile,v 1.8 2000/07/09 13:13:03 petere Exp $
# #
TOPDIR=../.. subdir = contrib/findoidjoins
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global CFLAGS += -I$(LIBPGEASYDIR) -I$(LIBPQDIR)
LIBS += $(LIBPGEASY)
NAME = findoidjoins all: findoidjoins
PROGRAM = $(NAME) install: all installdirs
OBJS = $(NAME).o $(INSTALL_PROGRAM) findoidjoins$(X) $(bindir)
DOCS = README.$(NAME) $(INSTALL_SCRIPT) make_oidjoins_check $(bindir)
SQLS = $(INSTALL_DATA) README.findoidjoins $(docdir)/contrib
BINS = $(PROGRAM) make_oidjoins_check
EXAMPLES=
MODS =
CFLAGS += -I$(LIBPGEASYDIR) -I$(LIBPQDIR) installdirs:
$(mkinstalldirs) $(bindir) $(docdir)/contrib
OTHER_CLEAN = uninstall:
rm -f $(bindir)/findoidjoins$(X) $(bindir)/make_oidjoins_check $(docdir)/contrib/README.findoidjoins
clean distclean maintainer-clean:
all: $(PROGRAM) rm -f findoidjoins$(X)
$(PROGRAM): $(OBJS) $(LIBPGEASYDIR)/libpgeasy.a
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPGEASY)
install: install_doc nstall_bin
install_doc:
for inst_file in $(DOCS); do \
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_bin:
for inst_file in $(BINS); do \
$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
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
contrib/fulltextindex/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.6 2000/07/04 16:16:48 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/fulltextindex/Attic/Makefile,v 1.7 2000/07/09 13:13:07 petere Exp $
# #
TOPDIR=../.. subdir = contrib/fulltextindex
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := fti
SONAME := $(NAME)$(DLSUFFIX)
NAME = fti
PROGRAM =
OBJS = $(NAME).o
DOCS = README.$(NAME)
SQLS = $(NAME).sql
BINS = fti.pl
EXAMPLES=
MODS = $(NAME)$(DLSUFFIX)
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
OTHER_CLEAN = $(SQLS) all: $(SONAME) $(NAME).sql
all: $(MODS) $(SQLS)
%.sql: %.sql.in $(NAME).sql: $(NAME).sql.in
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@ sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
install: install_doc install_sql install_mod install_bin install: all installdirs
$(INSTALL_SCRIPT) fti.pl $(bindir)
$(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib
$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
install_doc: installdirs:
for inst_file in $(DOCS); do \ $(mkinstalldirs) $(bindir) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_sql: uninstall:
for inst_file in $(SQLS); do \ rm -f $(bindir)/fti.pl $(libdir)/contrib/$(SONAME) \
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \ $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
done
install_mod: clean distclean maintainer-clean:
for inst_file in $(MODS); do \ rm -f $(SONAME) $(NAME).sql
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
done
install_bin:
for inst_file in $(BINS); do \
$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
done
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/isbn_issn/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.6 2000/07/04 16:16:53 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/isbn_issn/Attic/Makefile,v 1.7 2000/07/09 13:13:10 petere Exp $
# #
TOPDIR=../.. subdir = contrib/isbn_issn
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := isbn_issn
SONAME := $(NAME)$(DLSUFFIX)
NAME = isbn_issn
PROGRAM =
OBJS = $(NAME).o
DOCS = README.$(NAME)
SQLS = $(NAME).sql
BINS =
EXAMPLES=
MODS = $(NAME)$(DLSUFFIX)
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
OTHER_CLEAN = $(SQLS) all: $(SONAME) $(NAME).sql
all: $(MODS) $(SQLS)
$(NAME).sql: $(NAME).sql.in
sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
%.sql: %.sql.in install: all installdirs
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@ $(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
$(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib
install: install_doc install_sql install_mod installdirs:
$(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir)/contrib
install_doc: uninstall:
for inst_file in $(DOCS); do \ rm -rf $(docdir)/contrib/README.$(NAME) $(datadir)/contrib/$(NAME).sql $(libdir)/contrib/$(SONAME)
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_sql: clean distclean maintainer-clean:
for inst_file in $(SQLS); do \ rm -f $(SONAME) $(NAME).sql
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
done
install_mod:
for inst_file in $(MODS); do \
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
done
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/linux/Makefile deleted 100644 → 0
View file @ b59c03f8
#
# $Header: /cvsroot/pgsql/contrib/linux/Attic/Makefile,v 1.2 2000/06/19 13:53:41 momjian Exp $
#
TOPDIR=../..
include ../Makefile.global
NAME =
PROGRAM =
OBJS =
DOCS =
SQLS =
BINS =
BINS = postgres.init.csh postgres.init.sh
EXAMPLES=
MODS =
OTHER_CLEAN =
all:
install: install_bin
install_bin:
for inst_file in $(BINS); do \
$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
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
contrib/lo/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.6 2000/07/04 16:16:54 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/lo/Makefile,v 1.7 2000/07/09 13:13:14 petere Exp $
# #
TOPDIR=../.. subdir = contrib/lo
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := lo
SONAME := $(NAME)$(DLSUFFIX)
NAME = lo
PROGRAM =
OBJS = $(NAME).o
DOCS = README.$(NAME)
SQLS = $(NAME).sql lo_drop.sql lo_test.sql SQLS = $(NAME).sql lo_drop.sql lo_test.sql
BINS =
EXAMPLES=
MODS = $(NAME)$(DLSUFFIX) MODS = $(NAME)$(DLSUFFIX)
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
...@@ -22,39 +18,31 @@ ifdef REFINT_VERBOSE ...@@ -22,39 +18,31 @@ ifdef REFINT_VERBOSE
CFLAGS+= -DREFINT_VERBOSE CFLAGS+= -DREFINT_VERBOSE
endif endif
OTHER_CLEAN = $(SQLS) all: $(SONAME) $(NAME).sql
all: $(MODS) $(SQLS)
%.sql: %.sql.in $(NAME).sql: $(NAME).sql.in
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@ sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
install: all installdirs
$(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib
$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
$(INSTALL_DATA) lo_drop.sql $(datadir)/contrib
$(INSTALL_DATA) lo_test.sql $(datadir)/contrib
install: install_doc install_sql install_mod installdirs:
$(mkinstalldirs) $(libdir)/contrib $(docdir)/contrib $(datadir)/contrib
install_doc: uninstall:
for inst_file in $(DOCS); do \ rm -f $(libdir)/contrib/$(SONAME) $(docdir)/contrib/README.$(NAME) \
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ $(addprefix $(datadir)/contrib/, $(NAME).sql lo_drop.sql lo_test.sql)
done
install_sql: clean distclean maintainer-clean:
for inst_file in $(SQLS); do \ rm -f $(SONAME) $(NAME).sql
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
done
install_mod:
for inst_file in $(MODS); do \
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
done
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/mSQL-interface/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.3 2000/06/19 13:53:47 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/mSQL-interface/Attic/Makefile,v 1.4 2000/07/09 13:13:17 petere Exp $
# #
TOPDIR=../.. subdir = contrib/mSQL-interface
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := mpgsql
SO_MAJOR_VERSION := 0
SO_MINOR_VERSION := 0
OBJS := mpgsql.o
NAME = mpgsql CFLAGS += -I$(LIBPQDIR)
PROGRAM = include $(top_srcdir)/src/Makefile.shlib
OBJS =
DOCS = README.$(NAME) $(NAME).c
SQLS =
BINS =
EXAMPLES=
MODS =
OTHER_CLEAN = all: all-lib
all:: install: all installdirs install-lib
$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
install: install_doc installdirs:
$(mkinstalldirs) $(libdir) $(docdir)/contrib
install_doc: uninstall: uninstall-lib
for inst_file in $(DOCS); do \ rm -f $(docdir)/contrib/README.$(NAME)
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
clean: clean distclean maintainer-clean: clean-lib
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log rm -f $(OBJS)
ifeq (depend,$(wildcard depend))
include depend
endif
contrib/miscutil/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.11 2000/07/04 16:16:59 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/miscutil/Attic/Makefile,v 1.12 2000/07/09 13:13:20 petere Exp $
# #
TOPDIR=../.. subdir = contrib/miscutil
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := misc_utils
SONAME := $(NAME)$(DLSUFFIX)
NAME = misc_utils
PROGRAM =
OBJS = $(NAME).o
DOCS = README.$(NAME)
SQLS = $(NAME).sql
BINS =
EXAMPLES=
MODS = $(NAME)$(DLSUFFIX)
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
OTHER_CLEAN = $(SQLS) all: $(SONAME) $(NAME).sql
all: $(MODS) $(SQLS) $(NAME).sql: $(NAME).sql.in
sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
%.sql: %.sql.in install: all installdirs
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@ $(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib
$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
install: install_doc install_sql install_mod installdirs:
$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
install_doc: uninstall:
for inst_file in $(DOCS); do \ rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_sql: clean distclean maintainer-clean:
for inst_file in $(SQLS); do \ rm -f $(SONAME) $(NAME).sql
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
done
install_mod:
for inst_file in $(MODS); do \
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
done
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/noupdate/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.4 2000/07/04 16:17:03 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/noupdate/Attic/Makefile,v 1.5 2000/07/09 13:13:24 petere Exp $
# #
TOPDIR=../.. subdir = contrib/noupdate
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := noup
SONAME := $(NAME)$(DLSUFFIX)
NAME = noup
PROGRAM =
OBJS = $(NAME).o
DOCS = README.$(NAME)
SQLS = $(NAME).sql
BINS =
EXAMPLES=
MODS = $(NAME)$(DLSUFFIX)
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
OTHER_CLEAN = $(SQLS) all: $(SONAME) $(NAME).sql
all: $(MODS) $(SQLS) $(NAME).sql: $(NAME).sql.in
sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
%.sql: %.sql.in install: all installdirs
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@ $(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib
$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
install: install_doc install_sql install_mod installdirs:
$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
install_doc: uninstall:
for inst_file in $(DOCS); do \ rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_sql: clean distclean maintainer-clean:
for inst_file in $(SQLS); do \ rm -f $(SONAME) $(NAME).sql
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
done
install_mod:
for inst_file in $(MODS); do \
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
done
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/pg_dumplo/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.4 2000/06/19 13:54:01 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/pg_dumplo/Attic/Makefile,v 1.5 2000/07/09 13:13:24 petere Exp $
# #
TOPDIR=../.. subdir = contrib/pg_dumplo
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global
NAME = pg_dumplo
PROGRAM = $(NAME)
OBJS = main.o lo_export.o lo_import.o utils.o OBJS = main.o lo_export.o lo_import.o utils.o
DOCS = README.$(NAME)
SQLS =
BINS = $(PROGRAM)
EXAMPLES=
MODS =
CFLAGS += -I$(LIBPQDIR) CFLAGS += -I$(LIBPQDIR)
OTHER_CLEAN = all: pg_dumplo
all: $(PROGRAM)
$(PROGRAM): $(OBJS) $(LIBPQDIR)/libpq.a pg_dumplo: $(OBJS) $(LIBPQDIR)/libpq.a
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPQ) $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPQ)
install: install_doc install_bin install: all installdirs
$(INSTALL_PROGRAM) pg_dumplo$(X) $(bindir)
$(INSTALL_DATA) README.pg_dumplo $(docdir)/contrib
install_doc: installdirs:
for inst_file in $(DOCS); do \ $(mkinstalldirs) $(bindir) $(docdir)/contrib
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_bin: uninstall:
for inst_file in $(BINS); do \ rm -f $(bindir)/pg_dumplo$(X) $(docdir)/contrib/README.pg_dumplo
$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
done clean distclean maintainer-clean:
rm -f pg_dumplo $(OBJS)
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
\ No newline at end of file
contrib/pgbench/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.4 2000/06/19 13:54:09 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/pgbench/Makefile,v 1.5 2000/07/09 13:13:29 petere Exp $
# #
TOPDIR=../.. subdir = contrib/pgbench
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global CFLAGS += -I$(LIBPQDIR)
LIBS += $(LIBPQ)
NAME = pgbench all: pgbench
PROGRAM = $(NAME) install: all installdirs
OBJS = $(NAME).o $(INSTALL_PROGRAM) pgbench$(X) $(bindir)
DOCS = README.$(NAME) README.$(NAME)_jis $(INSTALL_DATA) README.pgbench $(docdir)/contrib
SQLS = $(INSTALL_DATA) README.pgbench_jis $(docdir)/contrib
BINS = $(PROGRAM)
EXAMPLES=
MODS =
CFLAGS += -I$(LIBPQDIR) installdirs:
$(mkinstalldirs) $(bindir) $(docdir)/contrib
OTHER_CLEAN = uninstall:
rm -f $(bindir)/pgbench$(X) $(docdir)/contrib/README.pgbench $(docdir)/contrib/README.pgbench_jis
all: $(PROGRAM) clean distclean maintainer-clean:
rm -f pgbench$(X)
$(PROGRAM): $(OBJS) $(LIBPQDIR)/libpq.a
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPQ)
install: install_doc install_bin
install_doc:
for inst_file in $(DOCS); do \
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_bin:
for inst_file in $(BINS); do \
$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
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
contrib/soundex/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/soundex/Attic/Makefile,v 1.6 2000/07/04 16:17:08 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/soundex/Attic/Makefile,v 1.7 2000/07/09 13:13:33 petere Exp $
# #
TOPDIR=../.. subdir = contrib/soundex
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := soundex
SONAME := $(NAME)$(DLSUFFIX)
NAME = soundex
PROGRAM =
OBJS = $(NAME).o
DOCS = README.$(NAME)
SQLS = $(NAME).sql
BINS =
EXAMPLES=
MODS = $(NAME)$(DLSUFFIX)
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
OTHER_CLEAN = $(SQLS) all: $(SONAME) $(NAME).sql
all: $(MODS) $(SQLS)
$(NAME).sql: $(NAME).sql.in
sed -e 's:MODULE_PATHNAME:$(datadir)/contrib/$(SONAME):g' < $< > $@
%.sql: %.sql.in install: all installdirs
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@ $(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib
$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
install: install_doc install_sql install_mod installdirs:
$(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
install_doc: uninstall:
for inst_file in $(DOCS); do \ rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_sql: clean distclean maintainer-clean:
for inst_file in $(SQLS); do \ rm -f $(SONAME) $(NAME).sql
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
done
install_mod:
for inst_file in $(MODS); do \
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
done
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/spi/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.16 2000/07/04 16:17:11 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/spi/Makefile,v 1.17 2000/07/09 13:13:36 petere Exp $
# #
TOPDIR=../.. subdir = contrib/spi
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global
NAME =
PROGRAM =
OBJS = autoinc.o insert_username.o moddatetime.o refint.o timetravel.o OBJS = autoinc.o insert_username.o moddatetime.o refint.o timetravel.o
DOCS = README.spi DOCS = README.spi
SQLS = $(OBJS:.o=.sql) SQLS = $(OBJS:.o=.sql)
BINS = EXAMPLES= $(OBJS:.o=.example)
EXAMPLES= $(OBJS:.o=.example) new_example.example
MODS = $(OBJS:.o=$(DLSUFFIX)) MODS = $(OBJS:.o=$(DLSUFFIX))
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
...@@ -22,43 +18,36 @@ ifdef REFINT_VERBOSE ...@@ -22,43 +18,36 @@ ifdef REFINT_VERBOSE
CFLAGS+= -DREFINT_VERBOSE CFLAGS+= -DREFINT_VERBOSE
endif endif
OTHER_CLEAN = $(SQLS)
all: $(MODS) $(SQLS) all: $(MODS) $(SQLS)
%.sql: %.sql.in %.sql: %.sql.in
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@ sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(@:.sql=$(DLSUFFIX)):g' < $< > $@
install: install_doc install_sql install_mod install_example
install_doc: install: all installdirs
for inst_file in $(DOCS); do \
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_sql:
for inst_file in $(SQLS); do \ for inst_file in $(SQLS); do \
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \ $(INSTALL_DATA) $$inst_file $(datadir)/contrib || exit; \
done done
install_mod:
for inst_file in $(MODS); do \ for inst_file in $(MODS); do \
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \ $(INSTALL_SHLIB) $$inst_file $(libdir)/contrib || exit; \
done done
for inst_file in $(EXAMPLES) README.spi; do \
install_example: $(INSTALL_DATA) $$inst_file $(docdir)/contrib/spi || exit; \
for inst_file in $(EXAMPLES); do \
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_EXAMPLESDIR); \
done done
installdirs:
$(mkinstalldirs) $(datadir)/contrib $(libdir)/contrib $(docdir)/contrib/spi
uninstall:
rm -f $(addprefix $(datadir)/contrib/, $(SQLS)) \
$(addprefix $(libdir)/contrib/, $(MODS)) \
$(addprefix $(docdir)/contrib/spi/, $(EXAMPLES) README.spi)
clean distclean maintainer-clean:
rm -f $(MODS) $(SQLS) $(OBJS)
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/statmath/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/statmath/Attic/Makefile,v 1.1 2000/07/04 14:36:03 wieck Exp $ # $Header: /cvsroot/pgsql/contrib/statmath/Attic/Makefile,v 1.2 2000/07/09 13:13:41 petere Exp $
# #
TOPDIR=../.. subdir = contrib/statmath
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := statmath
SONAME := $(NAME)$(DLSUFFIX)
NAME = statmath
PROGRAM =
OBJS = $(NAME).o
DOCS = README.$(NAME)
SQLS = $(NAME).sql
BINS =
EXAMPLES=
MODS = $(NAME)$(DLSUFFIX)
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
OTHER_CLEAN = $(SQLS) all: $(SONAME) $(NAME).sql
all: $(MODS) $(SQLS)
%.sql: %.sql.in
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(NAME)$(DLSUFFIX)|" < $< > $@
install: install_doc install_sql install_mod install_bin $(NAME).sql: $(NAME).sql.in
sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(SONAME):g' < $< > $@
install_doc: install: all installdirs
for inst_file in $(DOCS); do \ $(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ $(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
done $(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
install_sql: installdirs:
for inst_file in $(SQLS); do \ $(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
done
install_mod: uninstall:
for inst_file in $(MODS); do \ rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
done
install_bin: clean:
for inst_file in $(BINS); do \ rm -f $(SONAME) $(NAME).sql
$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
done
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/string/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.11 2000/07/04 16:17:17 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/string/Attic/Makefile,v 1.12 2000/07/09 13:13:43 petere Exp $
# #
TOPDIR=../.. subdir = contrib/string
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := string_io
SONAME := $(NAME)$(DLSUFFIX)
NAME = string_io
PROGRAM =
OBJS = $(NAME).o
DOCS = README.$(NAME)
SQLS = $(NAME).sql
BINS =
EXAMPLES=
MODS = $(NAME)$(DLSUFFIX)
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
OTHER_CLEAN = $(SQLS) all: $(SONAME) $(NAME).sql
all: $(MODS) $(SQLS)
%.sql: %.sql.in %.sql: %.sql.in
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@ sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(@:.sql=$(DLSUFFIX)):g' < $< > $@
install: install_doc install_sql install_mod install: all installdirs
$(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib
$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
install_doc: installdirs:
for inst_file in $(DOCS); do \ $(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_sql: uninstall:
for inst_file in $(SQLS); do \ rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
done
install_mod: clean distclean maintainer-clean:
for inst_file in $(MODS); do \ rm -f $(SONAME) $(NAME).sql
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
done
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/tips/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/tips/Attic/Makefile,v 1.3 2000/06/19 13:54:31 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/tips/Attic/Makefile,v 1.4 2000/07/09 13:13:43 petere Exp $
# #
TOPDIR=../.. subdir = contrib/tips
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global all:
NAME = install: installdirs
$(INSTALL_DATA) README.apachelog $(docdir)/contrib
PROGRAM = installdirs:
OBJS = $(mkinstalldirs) $(docdir)/contrib
DOCS = README.apachelog
SQLS =
BINS =
EXAMPLES=
MODS =
all::
install: install_doc
install_doc:
$(TOPDIR)/config/mkinstalldirs $(CONTRIB_DOCDIR)/tips
for inst_file in $(DOCS); do \
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR)/tips; \
done
clean:
$(RM) *~
uninstall:
rm -f $(docdir)/contrib/README.apachelog
contrib/tools/Makefile deleted 100644 → 0
View file @ b59c03f8
#
# $Header: /cvsroot/pgsql/contrib/tools/Attic/Makefile,v 1.3 2000/06/19 13:54:37 momjian Exp $
#
TOPDIR=../..
include ../Makefile.global
NAME =
PROGRAM =
OBJS =
DOCS =
SQLS =
BINS =
EXAMPLES=
MODS =
clean:
$(RM) *~
contrib/unixdate/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/unixdate/Attic/Makefile,v 1.2 2000/06/19 13:54:38 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/unixdate/Attic/Makefile,v 1.3 2000/07/09 13:13:50 petere Exp $
# #
TOPDIR=../.. subdir = contrib/unixdate
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global all:
NAME = unixdate install: installdirs
$(INSTALL_DATA) unixdate.sql $(datadir)/contrib
PROGRAM = uninstall:
OBJS = rm -f $(datadir)/contrib/unixdate.sql
DOCS =
SQLS = $(NAME).sql
BINS =
EXAMPLES=
MODS =
all::
install: install_sql
install_sql:
for inst_file in $(SQLS); do \
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
done
clean:
$(RM) *~
installdirs:
$(mkinstalldirs) $(datadir)/contrib
contrib/userlock/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.11 2000/07/04 16:17:21 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/userlock/Attic/Makefile,v 1.12 2000/07/09 13:13:52 petere Exp $
# #
TOPDIR=../.. subdir = contrib/userlock
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global NAME := user_locks
SONAME := $(NAME)$(DLSUFFIX)
NAME = user_locks
PROGRAM =
OBJS = $(NAME).o
DOCS = README.$(NAME)
SQLS = $(NAME).sql
BINS =
EXAMPLES=
MODS = $(NAME)$(DLSUFFIX)
CFLAGS += -I. $(CFLAGS_SL) CFLAGS += -I. $(CFLAGS_SL)
OTHER_CLEAN = $(SQLS) all: $(SONAME) $(NAME).sql
all: $(MODS) $(SQLS)
%.sql: %.sql.in %.sql: %.sql.in
$(SED) "s|MODULE_PATHNAME|$(CONTRIB_MODDIR)/$(@:.sql=$(DLSUFFIX))|" < $< > $@ sed -e 's:MODULE_PATHNAME:$(libdir)/contrib/$(@:.sql=$(DLSUFFIX)):g' < $< > $@
install: install_doc install_sql install_mod install: all installdirs
$(INSTALL_SHLIB) $(SONAME) $(libdir)/contrib
$(INSTALL_DATA) $(NAME).sql $(datadir)/contrib
$(INSTALL_DATA) README.$(NAME) $(docdir)/contrib
install_doc: installdirs:
for inst_file in $(DOCS); do \ $(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_sql: uninstall:
for inst_file in $(SQLS); do \ rm -rf $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME)
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \
done
install_mod: clean distclean maintainer-clean:
for inst_file in $(MODS); do \ rm -f $(SONAME) $(NAME).sql
$(INSTALL) $(INSTL_SHLIB_OPTS) $$inst_file $(CONTRIB_MODDIR); \
done
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
contrib/vacuumlo/Makefile
View file @ 74618e2b
# #
# $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.5 2000/06/19 13:54:50 momjian Exp $ # $Header: /cvsroot/pgsql/contrib/vacuumlo/Makefile,v 1.6 2000/07/09 13:13:55 petere Exp $
# #
TOPDIR=../.. subdir = contrib/vacuumlo
top_builddir = ../..
include ../../src/Makefile.global
include ../Makefile.global CPPFLAGS += -I$(LIBPQDIR)
LIBS += $(LIBPQ)
NAME = vacuumlo all: vacuumlo
PROGRAM = $(NAME) install: all installdirs
OBJS = $(NAME).o $(INSTALL_PROGRAM) vacuumlo$(X) $(bindir)
DOCS = README.$(NAME) $(INSTALL_DATA) README.vacuumlo $(docdir)/contrib
SQLS =
BINS = $(PROGRAM)
EXAMPLES=
MODS =
CFLAGS += -I$(LIBPQDIR) installdirs:
$(mkinstalldirs) $(bindir) $(docdir)/contrib
OTHER_CLEAN = uninstall:
rm -f $(bindir)/vacuumlo$(X) $(docdir)/contrib/README.vacuumlo
all: $(PROGRAM) clean distclean maintainer-clean:
rm -f vacuumlo$(X)
$(PROGRAM): $(OBJS) $(LIBPGEASYDIR)/libpgeasy.a
$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBPGEASY)
install: install_doc install_bin
install_doc:
for inst_file in $(DOCS); do \
$(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \
done
install_bin:
for inst_file in $(BINS); do \
$(INSTALL) $(INSTL_EXE_OPTS) $$inst_file $(CONTRIB_BINDIR); \
done
depend dep: depend dep:
$(CC) -MM -MG $(CFLAGS) *.c > depend $(CC) -MM -MG $(CFLAGS) *.c > depend
clean:
$(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log
ifeq (depend,$(wildcard depend)) ifeq (depend,$(wildcard depend))
include depend include depend
endif endif
doc/Makefile
View file @ 74618e2b
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.15 2000/05/17 16:57:40 momjian Exp $ # $Header: /cvsroot/pgsql/doc/Makefile,v 1.16 2000/07/09 13:13:55 petere Exp $
# #
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
...@@ -16,7 +16,6 @@ PGDOCS= $(POSTGRESDIR)/doc ...@@ -16,7 +16,6 @@ PGDOCS= $(POSTGRESDIR)/doc
SRCDIR= ../src SRCDIR= ../src
TAR= tar TAR= tar
GZCAT= zcat
# Pick up Makefile.global from the source area # Pick up Makefile.global from the source area
# This is the only resource from the code source area and is optional. # This is the only resource from the code source area and is optional.
...@@ -58,7 +57,7 @@ distclean:: ...@@ -58,7 +57,7 @@ distclean::
man:: man::
-@if test ! -d $(POSTMANDIR) ; then mkdir $(POSTMANDIR) ; fi -@if test ! -d $(POSTMANDIR) ; then mkdir $(POSTMANDIR) ; fi
$(GZCAT) man.tar.gz | (cd $(POSTMANDIR) ; $(TAR) xf - ) gunzip -c man.tar.gz | (cd $(POSTMANDIR) ; $(TAR) xf - )
# #
# Generic production rules # Generic production rules
...@@ -75,5 +74,5 @@ man:: ...@@ -75,5 +74,5 @@ man::
%: %.tar.gz %: %.tar.gz
rm -rf ./$@ $(PGDOCS)/$* rm -rf ./$@ $(PGDOCS)/$*
if test ! -d $(PGDOCS)/$* ; then mkdir $(PGDOCS)/$* ; fi if test ! -d $(PGDOCS)/$* ; then mkdir $(PGDOCS)/$* ; fi
$(GZCAT) $< | (cd $(PGDOCS)/$* ; $(TAR) xf - ) gunzip -c $< | (cd $(PGDOCS)/$* ; $(TAR) xf - )
# touch ./$* # touch ./$*
src/Makefile.global.in
View file @ 74618e2b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.85 2000/07/02 15:20:41 petere Exp $ # $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.86 2000/07/09 13:13:59 petere Exp $
# #
# NOTES # NOTES
# Essentially all Postgres make files include this file and use the # Essentially all Postgres make files include this file and use the
...@@ -38,17 +38,23 @@ ...@@ -38,17 +38,23 @@
# PostgreSQL version number # PostgreSQL version number
VERSION = @VERSION@ VERSION = @VERSION@
ifndef top_builddir
top_builddir = $(SRCDIR)/..
endif
ifndef SRCDIR ifndef SRCDIR
SRCDIR = $(top_builddir)/src
endif
# This should be changed once we have separate build dirs. # This should be changed once we have separate build dirs.
top_srcdir = $(top_builddir) top_srcdir = $(top_builddir)
ifeq ($(top_builddir), $(top_srcdir)) ifeq ($(top_builddir), $(top_srcdir))
srcdir = . srcdir = .
else else
srcdir = $(top_srcdir)/$(subdir) srcdir = $(top_srcdir)/$(subdir)
endif endif
VPATH = $(srcdir) VPATH = $(srcdir)
SRCDIR = $(top_builddir)/src
endif
############################################################################## ##############################################################################
# #
...@@ -88,7 +94,9 @@ sharedstatedir = @sharedstatedir@ ...@@ -88,7 +94,9 @@ sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@ localstatedir = @localstatedir@
libdir = @libdir@ libdir = @libdir@
includedir = @includedir@ includedir = @includedir@
mandir = @mandir@
docdir = ${prefix}/doc
odbcinst_ini_dir = @odbcinst_ini_dir@ odbcinst_ini_dir = @odbcinst_ini_dir@
# old variable names for installation directories # old variable names for installation directories
...@@ -97,8 +105,8 @@ POSTGRESDIR= $(prefix) ...@@ -97,8 +105,8 @@ POSTGRESDIR= $(prefix)
BINDIR= $(bindir) BINDIR= $(bindir)
LIBDIR= $(libdir) LIBDIR= $(libdir)
TEMPLATEDIR= $(libdir) TEMPLATEDIR= $(libdir)
POSTMANDIR= $(POSTGRESDIR)/man POSTMANDIR= $(mandir)
POSTDOCDIR= $(POSTGRESDIR)/doc POSTDOCDIR= $(docdir)
HEADERDIR= $(includedir) HEADERDIR= $(includedir)
...@@ -126,6 +134,8 @@ PYTHON = @PYTHON@ ...@@ -126,6 +134,8 @@ PYTHON = @PYTHON@
python_extmakefile = @python_extmakefile@ python_extmakefile = @python_extmakefile@
python_moduledir = @python_moduledir@ python_moduledir = @python_moduledir@
krb_srvtab = @krb_srvtab@
# #
# Please do not edit USE_TCL and USE_TK by hand. # Please do not edit USE_TCL and USE_TK by hand.
# #
...@@ -156,12 +166,6 @@ INSTALL_SHLIB = @INSTALL_SHLIB@ ...@@ -156,12 +166,6 @@ INSTALL_SHLIB = @INSTALL_SHLIB@
mkinstalldirs = @mkinstalldirs@ mkinstalldirs = @mkinstalldirs@
# don't use these any more
INSTLOPTS= @INSTLOPTS@
INSTL_EXE_OPTS= @INSTL_EXE_OPTS@
INSTL_LIB_OPTS= @INSTL_LIB_OPTS@
INSTL_SHLIB_OPTS= @INSTL_SHLIB_OPTS@
RANLIB= @RANLIB@ RANLIB= @RANLIB@
#------------------------------------------------------------- #-------------------------------------------------------------
...@@ -184,11 +188,11 @@ LDOUT= -o ...@@ -184,11 +188,11 @@ LDOUT= -o
DLSUFFIX= @DLSUFFIX@ DLSUFFIX= @DLSUFFIX@
LN_S= @LN_S@ LN_S= @LN_S@
TAR= @tar@ TAR= @tar@
GZCAT= @GZCAT@
PERL = @PERL@ PERL = @PERL@
AWK = @AWK@ AWK = @AWK@
CXX=@CXX@ CXX=@CXX@
CXXFLAGS=@CXXFLAGS@ @INCLUDES@ CXXFLAGS=@CXXFLAGS@ @INCLUDES@
GCC = @GCC@
############################################################################## ##############################################################################
...@@ -259,12 +263,6 @@ ifneq ($(CUSTOM_COPT),) ...@@ -259,12 +263,6 @@ ifneq ($(CUSTOM_COPT),)
COPT= $(CUSTOM_COPT) COPT= $(CUSTOM_COPT)
endif endif
GCC = @GCC@
ifeq ($(GCC), yes)
CFLAGS+= -Wall -Wmissing-prototypes -Wmissing-declarations
endif
ifdef COPT ifdef COPT
CFLAGS+= $(COPT) CFLAGS+= $(COPT)
LDFLAGS+= $(COPT) LDFLAGS+= $(COPT)
...@@ -284,3 +282,4 @@ SNPRINTF = @SNPRINTF@ ...@@ -284,3 +282,4 @@ SNPRINTF = @SNPRINTF@
STRDUP = @STRDUP@ STRDUP = @STRDUP@
.PHONY: all install installdirs uninstall dep depend clean distclean maintainer-clean .PHONY: all install installdirs uninstall dep depend clean distclean maintainer-clean
.SILENT: installdirs
src/backend/libpq/Makefile
View file @ 74618e2b
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
# Makefile for libpq subsystem (backend half of libpq interface) # Makefile for libpq subsystem (backend half of libpq interface)
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.21 2000/07/08 03:04:39 tgl Exp $ # $Header: /cvsroot/pgsql/src/backend/libpq/Makefile,v 1.22 2000/07/09 13:14:05 petere Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
SRCDIR = ../.. subdir = src/backend/libpq
top_builddir = ../..
include ../../Makefile.global include ../../Makefile.global
# be-fsstubs is here for historical reasons, probably belongs elsewhere # be-fsstubs is here for historical reasons, probably belongs elsewhere
...@@ -17,6 +18,12 @@ OBJS = be-fsstubs.o \ ...@@ -17,6 +18,12 @@ OBJS = be-fsstubs.o \
auth.o crypt.o hba.o password.o \ auth.o crypt.o hba.o password.o \
pqcomm.o pqformat.o pqpacket.o pqsignal.o util.o pqcomm.o pqformat.o pqpacket.o pqsignal.o util.o
# This location might depend on the installation directories. Therefore
# we can't subsitute it into config.h.
ifdef krb_srvtab
CPPFLAGS += -DPG_KRB_SRVTAB='"$(krb_srvtab)"'
endif
all: SUBSYS.o all: SUBSYS.o
......
src/backend/postmaster/postmaster.c
View file @ 74618e2b
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.153 2000/07/08 03:04:13 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.154 2000/07/09 13:14:05 petere Exp $
* *
* NOTES * NOTES
* *
...@@ -86,11 +86,6 @@ ...@@ -86,11 +86,6 @@
#include "utils/exc.h" #include "utils/exc.h"
#include "utils/guc.h" #include "utils/guc.h"
/*
* "postmaster.opts" is a file containing options for postmaser.
* pg_ctl will use it to restart postmaster.
*/
#define OPTSFNAME "postmaster.opts"
#if !defined(MAXINT) #if !defined(MAXINT)
#define MAXINT INT_MAX #define MAXINT INT_MAX
...@@ -246,7 +241,7 @@ extern int optind, ...@@ -246,7 +241,7 @@ extern int optind,
/* /*
* postmaster.c - function prototypes * postmaster.c - function prototypes
*/ */
static void pmdaemonize(char *extraoptions); static void pmdaemonize(int argc, char *argv[]);
static Port *ConnCreate(int serverFd); static Port *ConnCreate(int serverFd);
static void ConnFree(Port *port); static void ConnFree(Port *port);
static void reset_shared(int port); static void reset_shared(int port);
...@@ -267,15 +262,7 @@ static long PostmasterRandom(void); ...@@ -267,15 +262,7 @@ static long PostmasterRandom(void);
static void RandomSalt(char *salt); static void RandomSalt(char *salt);
static void SignalChildren(SIGNAL_ARGS); static void SignalChildren(SIGNAL_ARGS);
static int CountChildren(void); static int CountChildren(void);
static int static bool CreateOptsFile(int argc, char *argv[]);
SetOptsFile(char *progname, int port, char *datadir,
int assert, int nbuf,
int debuglvl, int netserver,
#ifdef USE_SSL
int securenetserver,
#endif
int maxbackends, int reinit,
int silent, int sendstop, char *extraoptions);
extern int BootstrapMain(int argc, char *argv[]); extern int BootstrapMain(int argc, char *argv[]);
static pid_t SSDataBase(bool startup); static pid_t SSDataBase(bool startup);
...@@ -564,8 +551,8 @@ PostmasterMain(int argc, char *argv[]) ...@@ -564,8 +551,8 @@ PostmasterMain(int argc, char *argv[])
#ifdef USE_SSL #ifdef USE_SSL
if (!NetServer && SecureNetServer) if (!NetServer && SecureNetServer)
{ {
fprintf(stderr, "For SSL, you must enable TCP/IP connections.\n", fprintf(stderr, "%s: For SSL, you must enable TCP/IP connections.\n",
argv[0]); progname);
exit(1); exit(1);
} }
InitSSL(); InitSSL();
...@@ -602,7 +589,7 @@ PostmasterMain(int argc, char *argv[]) ...@@ -602,7 +589,7 @@ PostmasterMain(int argc, char *argv[])
PortList = DLNewList(); PortList = DLNewList();
if (silentflag) if (silentflag)
pmdaemonize(original_extraoptions); pmdaemonize(argc, argv);
else else
{ {
...@@ -612,26 +599,7 @@ PostmasterMain(int argc, char *argv[]) ...@@ -612,26 +599,7 @@ PostmasterMain(int argc, char *argv[])
SetPidFname(DataDir); SetPidFname(DataDir);
if (SetPidFile(getpid()) == 0) if (SetPidFile(getpid()) == 0)
{ {
if (SetOptsFile( if (!CreateOptsFile(argc, argv))
progname, /* postmaster executable file */
PostPortName, /* port number */
DataDir, /* PGDATA */
assert_enabled, /* whether -A is specified
* or not */
NBuffers, /* -B: number of shared buffers */
DebugLvl, /* -d: debug level */
NetServer, /* -i: accept connection from INET */
#ifdef USE_SSL
SecureNetServer, /* -l: use SSL */
#endif
MaxBackends, /* -N: max number of
* backends */
Reinit, /* -n: reinit shared mem after
* failure */
silentflag, /* -S: detach tty */
SendStop, /* -s: send SIGSTOP */
original_extraoptions /* options for backend */
) != 0)
{ {
UnlinkPidFile(); UnlinkPidFile();
ExitPostmaster(1); ExitPostmaster(1);
...@@ -678,7 +646,7 @@ PostmasterMain(int argc, char *argv[]) ...@@ -678,7 +646,7 @@ PostmasterMain(int argc, char *argv[])
} }
static void static void
pmdaemonize(char *extraoptions) pmdaemonize(int argc, char *argv[])
{ {
int i; int i;
pid_t pid; pid_t pid;
...@@ -700,26 +668,7 @@ pmdaemonize(char *extraoptions) ...@@ -700,26 +668,7 @@ pmdaemonize(char *extraoptions)
*/ */
if (SetPidFile(pid) == 0) if (SetPidFile(pid) == 0)
{ {
if (SetOptsFile( if (!CreateOptsFile(argc, argv))
progname, /* postmaster executable file */
PostPortName, /* port number */
DataDir, /* PGDATA */
assert_enabled, /* whether -A is specified
* or not */
NBuffers, /* -B: number of shared buffers */
DebugLvl, /* -d: debug level */
NetServer, /* -i: accept connection from INET */
#ifdef USE_SSL
SecureNetServer, /* -l: use SSL */
#endif
MaxBackends, /* -N: max number of
* backends */
Reinit, /* -n: reinit shared mem after
* failure */
1, /* -S: detach tty */
SendStop, /* -s: send SIGSTOP */
extraoptions /* options for backend */
) != 0)
{ {
/* /*
...@@ -2202,84 +2151,44 @@ SSDataBase(bool startup) ...@@ -2202,84 +2151,44 @@ SSDataBase(bool startup)
return (pid); return (pid);
} }
/* /*
* Create the opts file * Create the opts file
*/ */
static int static bool
SetOptsFile(char *progname, int port, char *datadir, CreateOptsFile(int argc, char *argv[])
int assert, int nbuf,
int debuglvl, int netserver,
#ifdef USE_SSL
int securenetserver,
#endif
int maxbackends, int reinit,
int silent, int sendstop, char *extraoptions)
{ {
int fd; char fullprogname[MAXPGPATH];
char optsfile[MAXPGPATH]; char *filename;
char opts[1024]; FILE *fp;
char buf[1024]; unsigned i;
/* if (FindExec(fullprogname, argv[0], "postmaster") == -1)
* Creating opts file return false;
*/
snprintf(optsfile, sizeof(optsfile), "%s/%s", datadir, OPTSFNAME);
fd = open(optsfile, O_RDWR | O_TRUNC | O_CREAT, 0600);
if (fd < 0)
{
fprintf(stderr, "Can't create optsfile:%s", optsfile);
return (-1);
}
snprintf(opts, sizeof(opts), "%s\n-p %d\n-D %s\n", progname, port, datadir);
if (assert)
{
sprintf(buf, "-A %d\n", assert);
strcat(opts, buf);
}
snprintf(buf, sizeof(buf), "-B %d\n", nbuf); filename = palloc(strlen(DataDir) + 20);
strcat(opts, buf); sprintf(filename, "%s/postmaster.opts", DataDir);
if (debuglvl) fp = fopen(filename, "w");
if (fp == NULL)
{ {
sprintf(buf, "-d %d\n", debuglvl); fprintf(stderr, "%s: cannot create file %s: %s\n", progname,
strcat(opts, buf); filename, strerror(errno));
return false;
} }
if (netserver) fprintf(fp, "%s", fullprogname);
strcat(opts, "-i\n"); for (i = 1; i < argc; i++)
fprintf(fp, " '%s'", argv[i]);
#ifdef USE_SSL fputs("\n", fp);
if (securenetserver)
strcat(opts, "-l\n");
#endif
snprintf(buf, sizeof(buf), "-N %d\n", maxbackends);
strcat(opts, buf);
if (!reinit)
strcat(opts, "-n\n");
if (silent)
strcat(opts, "-S\n");
if (sendstop)
strcat(opts, "-s\n");
if (strlen(extraoptions) > 0)
{
strcat(opts, "-o '");
strcat(opts, extraoptions);
strcat(opts, "'");
}
if (write(fd, opts, strlen(opts)) != strlen(opts)) if (ferror(fp))
{ {
perror("Writing to opts file failed"); fprintf(stderr, "%s: writing file %s failed\n", progname, filename);
close(fd); fclose(fp);
return (-1); return false;
} }
close(fd);
return (0); fclose(fp);
return true;
} }
src/backend/utils/init/findbe.c
View file @ 74618e2b
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.18 2000/06/08 22:37:33 momjian Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/init/Attic/findbe.c,v 1.19 2000/07/09 13:14:08 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -151,7 +151,7 @@ ValidateBinary(char *path) ...@@ -151,7 +151,7 @@ ValidateBinary(char *path)
* we change directories to the /data directory. * we change directories to the /data directory.
*/ */
int int
FindExec(char *full_path, char *argv0, char *binary_name) FindExec(char *full_path, const char *argv0, const char *binary_name)
{ {
char buf[MAXPGPATH + 2]; char buf[MAXPGPATH + 2];
char *p; char *p;
......
src/backend/utils/misc/ps_status.c
View file @ 74618e2b
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* to contain some useful information. Differs wildly across * to contain some useful information. Differs wildly across
* platforms. * platforms.
* *
* $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.1 2000/06/04 01:44:34 petere Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/misc/ps_status.c,v 1.2 2000/07/09 13:14:11 petere Exp $
* *
* Copyright 2000 by PostgreSQL Global Development Group * Copyright 2000 by PostgreSQL Global Development Group
* various details abducted from various places * various details abducted from various places
...@@ -20,11 +20,9 @@ ...@@ -20,11 +20,9 @@
#ifdef HAVE_SYS_PSTAT_H #ifdef HAVE_SYS_PSTAT_H
# include <sys/pstat.h> /* for HP-UX */ # include <sys/pstat.h> /* for HP-UX */
#endif #endif
#ifdef HAVE_MACHINE_VMPARAM_H #ifdef HAVE_PS_STRINGS
# include <machine/vmparam.h> /* for old BSD */ # include <machine/vmparam.h> /* for old BSD */
#endif # include <sys/exec.h>
#ifdef HAVE_SYS_EXEC_H
# include <sys/exec.h> /* for old BSD */
#endif #endif
#include "miscadmin.h" #include "miscadmin.h"
......
src/include/config.h.in
View file @ 74618e2b
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* or in config.h afterwards. Of course, if you edit config.h, then your * or in config.h afterwards. Of course, if you edit config.h, then your
* changes will be overwritten the next time you run configure. * changes will be overwritten the next time you run configure.
* *
* $Id: config.h.in,v 1.123 2000/07/05 17:44:29 scrappy Exp $ * $Id: config.h.in,v 1.124 2000/07/09 13:14:13 petere Exp $
*/ */
#ifndef CONFIG_H #ifndef CONFIG_H
...@@ -58,8 +58,8 @@ ...@@ -58,8 +58,8 @@
/* Kerberos name of the Postgres service principal (--with-krb-srvnam=NAME) */ /* Kerberos name of the Postgres service principal (--with-krb-srvnam=NAME) */
#undef PG_KRB_SRVNAM #undef PG_KRB_SRVNAM
/* Location of the Kerberos server's keytab file (--with-krb-srvtab=FILE) */ /* Define to build with (Open)SSL support (--with-openssl[=DIR]) */
#undef PG_KRB_SRVTAB #undef USE_SSL
/* /*
* DEF_PGPORT is the TCP port number on which the Postmaster listens and * DEF_PGPORT is the TCP port number on which the Postmaster listens and
......
src/include/miscadmin.h
View file @ 74618e2b
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
* Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1996-2000, PostgreSQL, Inc
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: miscadmin.h,v 1.62 2000/07/02 15:21:18 petere Exp $ * $Id: miscadmin.h,v 1.63 2000/07/09 13:14:13 petere Exp $
* *
* NOTES * NOTES
* some of the information in this file will be moved to * some of the information in this file will be moved to
...@@ -133,7 +133,7 @@ extern char *getpgusername(void); ...@@ -133,7 +133,7 @@ extern char *getpgusername(void);
extern void SetPgUserName(void); extern void SetPgUserName(void);
extern int GetUserId(void); extern int GetUserId(void);
extern void SetUserId(void); extern void SetUserId(void);
extern int FindExec(char *backend, char *argv0, char *binary_name); extern int FindExec(char *full_path, const char *argv0, const char *binary_name);
extern int CheckPathAccess(char *path, char *name, int open_mode); extern int CheckPathAccess(char *path, char *name, int open_mode);
/* lower case version for case-insensitive SQL referenced in pg_proc.h */ /* lower case version for case-insensitive SQL referenced in pg_proc.h */
......
src/interfaces/libpq/fe-connect.c
View file @ 74618e2b
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.130 2000/06/14 18:17:58 petere Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.131 2000/07/09 13:14:17 petere Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -795,7 +795,7 @@ connectDBStart(PGconn *conn) ...@@ -795,7 +795,7 @@ connectDBStart(PGconn *conn)
np.protoVersion = htonl(NEGOTIATE_SSL_CODE); np.protoVersion = htonl(NEGOTIATE_SSL_CODE);
if (pqPacketSend(conn, (char *) &np, sizeof(StartupPacket)) != STATUS_OK) if (pqPacketSend(conn, (char *) &np, sizeof(StartupPacket)) != STATUS_OK)
{ {
sprintf(conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
"connectDB() -- couldn't send SSL negotiation packet: errno=%d\n%s\n", "connectDB() -- couldn't send SSL negotiation packet: errno=%d\n%s\n",
errno, strerror(errno)); errno, strerror(errno));
goto connect_errReturn; goto connect_errReturn;
...@@ -803,7 +803,7 @@ connectDBStart(PGconn *conn) ...@@ -803,7 +803,7 @@ connectDBStart(PGconn *conn)
/* Now receive the postmasters response */ /* Now receive the postmasters response */
if (recv(conn->sock, &SSLok, 1, 0) != 1) if (recv(conn->sock, &SSLok, 1, 0) != 1)
{ {
sprintf(conn->errorMessage, "PQconnectDB() -- couldn't read postmaster response: errno=%d\n%s\n", printfPQExpBuffer(&conn->errorMessage, "PQconnectDB() -- couldn't read postmaster response: errno=%d\n%s\n",
errno, strerror(errno)); errno, strerror(errno));
goto connect_errReturn; goto connect_errReturn;
} }
...@@ -816,7 +816,7 @@ connectDBStart(PGconn *conn) ...@@ -816,7 +816,7 @@ connectDBStart(PGconn *conn)
SSL_context = SSL_CTX_new(SSLv23_method()); SSL_context = SSL_CTX_new(SSLv23_method());
if (!SSL_context) if (!SSL_context)
{ {
sprintf(conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
"connectDB() -- couldn't create SSL context: %s\n", "connectDB() -- couldn't create SSL context: %s\n",
ERR_reason_error_string(ERR_get_error())); ERR_reason_error_string(ERR_get_error()));
goto connect_errReturn; goto connect_errReturn;
...@@ -826,7 +826,7 @@ connectDBStart(PGconn *conn) ...@@ -826,7 +826,7 @@ connectDBStart(PGconn *conn)
!SSL_set_fd(conn->ssl, conn->sock) || !SSL_set_fd(conn->ssl, conn->sock) ||
SSL_connect(conn->ssl) <= 0) SSL_connect(conn->ssl) <= 0)
{ {
sprintf(conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
"connectDB() -- couldn't establish SSL connection: %s\n", "connectDB() -- couldn't establish SSL connection: %s\n",
ERR_reason_error_string(ERR_get_error())); ERR_reason_error_string(ERR_get_error()));
goto connect_errReturn; goto connect_errReturn;
...@@ -844,7 +844,7 @@ connectDBStart(PGconn *conn) ...@@ -844,7 +844,7 @@ connectDBStart(PGconn *conn)
} }
else if (SSLok != 'N') else if (SSLok != 'N')
{ {
strcpy(conn->errorMessage, printfPQExpBuffer(&conn->errorMessage,
"Received invalid negotiation response.\n"); "Received invalid negotiation response.\n");
goto connect_errReturn; goto connect_errReturn;
} }
......
src/test/regress/run_check.sh
View file @ 74618e2b
#!/bin/sh #!/bin/sh
# #
# $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.21 2000/07/06 21:33:45 petere Exp $ # $Header: /cvsroot/pgsql/src/test/regress/Attic/run_check.sh,v 1.22 2000/07/09 13:14:19 petere Exp $
# ---------- # ----------
# Check call syntax # Check call syntax
...@@ -187,7 +187,7 @@ export PATH ...@@ -187,7 +187,7 @@ export PATH
# Run initdb to initialize a database system in ./tmp_check # Run initdb to initialize a database system in ./tmp_check
# ---------- # ----------
echo "=============== Initializing check database instance ================" echo "=============== Initializing check database instance ================"
initdb -D $PGDATA --noclean >$LOGDIR/initdb.log 2>&1 initdb -D $PGDATA -L $CHKDIR/share --noclean >$LOGDIR/initdb.log 2>&1
if [ $? -ne 0 ] if [ $? -ne 0 ]
then then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment