diff options
| author | Bruce Momjian | 2000-03-08 01:58:46 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2000-03-08 01:58:46 +0000 |
| commit | f43ec05d05bb22e7bd398ea7a8399d157eca6fb4 (patch) | |
| tree | 6ba6e867726640a9f313539a51c2814b36dc511c /src/backend/Makefile | |
| parent | 26c953e3732150e8992f4d1ad3da703b9587e175 (diff) | |
I've made a diff against the 7.0beta1 tree that accomplishes several things:
1) adds NetBSD shared lib support on both ELF and a.out platforms
2) replaces "-L$(LIBPQDIR) -lpq" with "$(LIBPQ)" defined in
Makefile.global. This makes it much easier to build stuff in
the source tree after you've already installed the libraries.
3) adds TEMPLATEDIR in Makefile.global that indicates where the
database templates are stored. This separates the template files
from real libraries that are installed in $(LIBDIR).
4) changes include order of <readline/readline.h> and <readline.h>.
The latest GNU readline installs its headers under a readline
subdirectory.
In addition to applying the patch below the following files need to be copied:
backend/port/dynloader:
bsd.h -> netbsd.h
bsd.c -> netbsd.c
include/port:
bsd.h -> netbsd.h
makefiles:
Makefile.bsd -> Makefile.netbsd
It would be great to see this incorporated into the source tree before
the 7.0 release is cut.
Thanks!
-- Johnny C. Lam <lamj@stat.cmu.edu>
Diffstat (limited to 'src/backend/Makefile')
| -rw-r--r-- | src/backend/Makefile | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index fe77dde8e2..1033de1c8a 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -34,7 +34,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.43 2000/02/27 01:26:12 tgl Exp $ +# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.44 2000/03/08 01:58:16 momjian Exp $ # #------------------------------------------------------------------------- @@ -165,10 +165,11 @@ endif # and (2) the parameters of a database system should be set at initdb time, # not at postgres build time. -.PHONY: install install-bin install-lib install-headers +.PHONY: install install-bin install-templates install-headers -install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) \ - install-bin install-lib install-headers +install: $(LIBDIR) $(BINDIR) $(HEADERDIR) $(TEMPLATEDIR) \ + postgres $(POSTGRES_IMP) \ + install-bin install-templates install-headers install-bin: $(BINDIR) postgres$(X) $(POSTGRES_IMP) $(INSTALL) $(INSTL_EXE_OPTS) postgres$(X) $(BINDIR)/postgres$(X) @@ -184,22 +185,22 @@ ifeq ($(MAKE_DLL), true) endif endif -install-lib: $(LIBDIR) \ +install-templates: $(TEMPLATEDIR) \ global1.bki.source local1_template1.bki.source \ global1.description local1_template1.description \ libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample $(INSTALL) $(INSTLOPTS) global1.bki.source \ - $(LIBDIR)/global1.bki.source + $(TEMPLATEDIR)/global1.bki.source $(INSTALL) $(INSTLOPTS) global1.description \ - $(LIBDIR)/global1.description + $(TEMPLATEDIR)/global1.description $(INSTALL) $(INSTLOPTS) local1_template1.bki.source \ - $(LIBDIR)/local1_template1.bki.source + $(TEMPLATEDIR)/local1_template1.bki.source $(INSTALL) $(INSTLOPTS) local1_template1.description \ - $(LIBDIR)/local1_template1.description + $(TEMPLATEDIR)/local1_template1.description $(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \ - $(LIBDIR)/pg_hba.conf.sample + $(TEMPLATEDIR)/pg_hba.conf.sample $(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \ - $(LIBDIR)/pg_geqo.sample + $(TEMPLATEDIR)/pg_geqo.sample install-headers: fmgr.h $(SRCDIR)/include/config.h -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi @@ -263,6 +264,8 @@ $(LIBDIR): mkdir $@ $(HEADERDIR): mkdir $@ +$(TEMPLATEDIR): + mkdir $@ ############################################################################# # |