diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-03-18 23:35:18 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-03-18 23:35:18 +0000 |
| commit | 8f82141b5428d86104d8208b656046ef3a3265fb (patch) | |
| tree | 0daf71447414c420474033508bdadec6ef78f67c | |
| parent | 7c9f29546c13375e786d60d52873c93f0e8ace2b (diff) | |
| download | postgresql-8f82141b5428d86104d8208b656046ef3a3265fb.tar.gz postgresql-8f82141b5428d86104d8208b656046ef3a3265fb.zip | |
Restore Peter's makefile fixes.
| -rw-r--r-- | contrib/intarray/Makefile | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/contrib/intarray/Makefile b/contrib/intarray/Makefile index 3d450778250..be7d3e58d4c 100644 --- a/contrib/intarray/Makefile +++ b/contrib/intarray/Makefile @@ -1,3 +1,5 @@ +# $Header: /cvsroot/pgsql/contrib/intarray/Makefile,v 1.5 2001/03/18 23:35:18 tgl Exp $ + subdir = contrib/intarray top_builddir = ../.. include $(top_builddir)/src/Makefile.global @@ -10,7 +12,7 @@ NAME= _int SO_MAJOR_VERSION= 1 SO_MINOR_VERSION= 0 -override CPPFLAGS += -I$(srcdir) -DPGSQL71 +override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) -DPGSQL71 OBJS= _int.o @@ -21,46 +23,31 @@ include $(top_srcdir)/src/Makefile.shlib $(NAME).sql: $(NAME).sql.in - sed -e 's:MODULE_PATHNAME:$(libdir)/$(shlib):g' < $< > $@ + sed 's,MODULE_PATHNAME,$(libdir)/$(shlib),g' $< >$@ .PHONY: submake submake: $(MAKE) -C $(top_builddir)/src/test/regress pg_regress -# against installed postmaster installcheck: submake $(top_builddir)/src/test/regress/pg_regress _int -# in-tree test doesn't work yet (no way to install my shared library) -#check: all submake -# $(top_builddir)/src/test/regress/pg_regress --temp-install \ -# --top-builddir=$(top_builddir) _int check: - @echo "'make check' is not supported." - @echo "Do 'make install', then 'make installcheck' instead." + @echo "'$(MAKE) check' is not supported." + @echo "Do '$(MAKE) install', then '$(MAKE) installcheck' instead." install: all installdirs install-lib - #$(INSTALL_DATA) $(srcdir)/README.$(NAME) $(docdir)/contrib + $(INSTALL_DATA) $(srcdir)/README.intarray $(docdir)/contrib $(INSTALL_DATA) $(NAME).sql $(datadir)/contrib installdirs: $(mkinstalldirs) $(docdir)/contrib $(datadir)/contrib $(libdir) uninstall: uninstall-lib - rm -f $(docdir)/contrib/README.$(NAME) $(datadir)/contrib/$(NAME).sql + rm -f $(docdir)/contrib/README.intarray $(datadir)/contrib/$(NAME).sql clean distclean maintainer-clean: clean-lib - rm -f *.so y.tab.c y.tab.h $(OBJS) $(NAME).sql + rm -f $(OBJS) $(NAME).sql # things created by various check targets - rm -rf results tmp_check log - rm -f regression.diffs regression.out regress.out run_check.out -ifeq ($(PORTNAME), win) - rm -f regress.def -endif - -depend dep: - $(CC) -MM $(CFLAGS) *.c >depend - -ifeq (depend,$(wildcard depend)) -include depend -endif + rm -rf results + rm -f regression.diffs regression.out |