diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2000-07-09 13:14:19 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2000-07-09 13:14:19 +0000 |
| commit | 74618e2b82b5158adf42caf64af70cbd7c699c6c (patch) | |
| tree | f4782dc597569b1e2feb6ac50cad217dc39f35ee /contrib/string | |
| parent | b59c03f84206ed3f3f864dcbe337ec04b2a8558d (diff) | |
| download | postgresql-74618e2b82b5158adf42caf64af70cbd7c699c6c.tar.gz postgresql-74618e2b82b5158adf42caf64af70cbd7c699c6c.zip | |
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.
Diffstat (limited to 'contrib/string')
| -rw-r--r-- | contrib/string/Makefile | 52 |
1 files changed, 18 insertions, 34 deletions
diff --git a/contrib/string/Makefile b/contrib/string/Makefile index ad80116e032..1b01e63afbf 100644 --- a/contrib/string/Makefile +++ b/contrib/string/Makefile @@ -1,54 +1,38 @@ # -# $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 - -PROGRAM = -OBJS = $(NAME).o -DOCS = README.$(NAME) -SQLS = $(NAME).sql -BINS = -EXAMPLES= -MODS = $(NAME)$(DLSUFFIX) +NAME := string_io +SONAME := $(NAME)$(DLSUFFIX) CFLAGS += -I. $(CFLAGS_SL) -OTHER_CLEAN = $(SQLS) - -all: $(MODS) $(SQLS) - +all: $(SONAME) $(NAME).sql %.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: - for inst_file in $(DOCS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_DOCDIR); \ - done +installdirs: + $(mkinstalldirs) $(libdir)/contrib $(datadir)/contrib $(docdir)/contrib -install_sql: - for inst_file in $(SQLS); do \ - $(INSTALL) $(INSTL_LIB_OPTS) $$inst_file $(CONTRIB_SQLDIR); \ - done +uninstall: + rm -f $(libdir)/contrib/$(SONAME) $(datadir)/contrib/$(NAME).sql $(docdir)/contrib/README.$(NAME) -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: $(CC) -MM -MG $(CFLAGS) *.c > depend -clean: - $(RM) *~ $(OBJS) $(MODS) $(PROGRAM) depend $(OTHER_CLEAN) core log - ifeq (depend,$(wildcard depend)) include depend endif |