open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make DESTDIR consistent, and verious Linux cleanups.

Browse Source
REL6_4
Bruce Momjian 28 years ago
parent 5523beb949
commit 066ee9a2e9
10 changed files with 88 additions and 98 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      doc/Makefile
  2. 28
      src/backend/Makefile
  3. 2
      src/interfaces/ecpg/lib/Makefile.in
  4. 6
      src/interfaces/libpgtcl/Makefile.in
  5. 20
      src/interfaces/libpq++/Makefile
  6. 9
      src/interfaces/libpq++/man/Makefile
  7. 72
      src/interfaces/libpq/Makefile.in
  8. 23
      src/interfaces/perl5/Makefile.PL
  9. 2
      src/makefiles/Makefile.linux
  10. 20
      src/man/Makefile

4
doc/Makefile
Unescape View File

@ -8,11 +8,11 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.5 1998/03/15 07:37:51 scrappy Exp $
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.6 1998/04/06 01:35:16 momjian Exp $
#
#----------------------------------------------------------------------------
PGDOCS= /usr/local/cdrom/docs
PGDOCS= unpacked
SRCDIR= ../src
TAR= tar

28
src/backend/Makefile
Unescape View File

@ -34,7 +34,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.30 1998/01/04 19:12:02 scrappy Exp $
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.31 1998/04/06 01:35:19 momjian Exp $
#
#-------------------------------------------------------------------------
@ -125,31 +125,31 @@ clean:
# and (2) the parameters of a database system should be set at initdb time,
# not at postgres build time.
install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
install: $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
global1.bki.source local1_template1.bki.source \
global1.description local1_template1.description \
libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
$(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres
$(INSTALL) $(INSTL_EXE_OPTS) postgres $(DESTDIR)$(BINDIR)/postgres
ifeq ($(MAKE_EXPORTS), true)
$(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)
$(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(DESTDIR)$(LIBDIR)/$(POSTGRES_IMP)
endif
@rm -f $(BINDIR)/postmaster
ln -s postgres $(BINDIR)/postmaster
$(INSTALL) $(INSTLOPTS) fmgr.h $(HEADERDIR)/fmgr.h
@rm -f $(DESTDIR)$(BINDIR)/postmaster
ln -s postgres $(DESTDIR)$(BINDIR)/postmaster
$(INSTALL) $(INSTLOPTS) fmgr.h $(DESTDIR)$(HEADERDIR)/fmgr.h
$(INSTALL) $(INSTLOPTS) global1.bki.source \
$(LIBDIR)/global1.bki.source
$(DESTDIR)$(LIBDIR)/global1.bki.source
$(INSTALL) $(INSTLOPTS) global1.description \
$(LIBDIR)/global1.description
$(DESTDIR)$(LIBDIR)/global1.description
$(INSTALL) $(INSTLOPTS) local1_template1.bki.source \
$(LIBDIR)/local1_template1.bki.source
$(DESTDIR)$(LIBDIR)/local1_template1.bki.source
$(INSTALL) $(INSTLOPTS) local1_template1.description \
$(LIBDIR)/local1_template1.description
$(DESTDIR)$(LIBDIR)/local1_template1.description
$(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \
$(LIBDIR)/pg_hba.conf.sample
$(DESTDIR)$(LIBDIR)/pg_hba.conf.sample
$(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \
$(LIBDIR)/pg_geqo.sample
$(DESTDIR)$(LIBDIR)/pg_geqo.sample
$(BINDIR) $(LIBDIR) $(HEADERDIR):
$(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(HEADERDIR):
mkdir $@
#############################################################################

2
src/interfaces/ecpg/lib/Makefile.in
Unescape View File

@ -19,7 +19,7 @@ ifeq ($(PORTNAME), linux)
ifdef LINUX_ELF
install-shlib-dep := install-shlib
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
LDFLAGS_SL = -shared
LDFLAGS_SL = -shared -soname libecpg.so.$(SO_MAJOR_VERSION)
CFLAGS += $(CFLAGS_SL)
endif
endif

6
src/interfaces/libpgtcl/Makefile.in
Unescape View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.9 1998/04/06 01:16:38 momjian Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.10 1998/04/06 01:35:43 momjian Exp $
#
#-------------------------------------------------------------------------
@ -88,10 +88,10 @@ $(shlib): $(OBJS)
install: install-headers install-libpgtcl $(install-shlib-dep)
install-headers: beforeinstall-headers libpgtcl.h
$(INSTALL) $(INSTLOPTS) libpgtcl.h $(HEADERDIR)/libpgtcl.h
$(INSTALL) $(INSTLOPTS) libpgtcl.h $(DESTDIR)$(HEADERDIR)/libpgtcl.h
beforeinstall-headers:
@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
@if [ ! -d $(DESTDIR)$(HEADERDIR) ]; then mkdir $(DESTDIR)$(HEADERDIR); fi
install-libpgtcl: libpgtcl.a
$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(DESTDIR)$(LIBDIR)/libpgtcl.a

20
src/interfaces/libpq++/Makefile
Unescape View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.13 1998/04/06 01:16:47 momjian Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.14 1998/04/06 01:36:07 momjian Exp $
#
#-------------------------------------------------------------------------
@ -45,7 +45,13 @@ INSTALL-SHLIB-DEP :=
ifeq ($(PORTNAME), i386_solaris)
INSTALL-SHLIB-DEP := install-shlib
SHLIB := libpq++.so.1
LDFLAGS_SL = -G -z text
LDFLAGS_SL = -G -z text -shared -soname $(SHLIB)
CFLAGS += $(CFLAGS_SL)
endif
ifeq ($(PORTNAME), linux)
INSTALL-SHLIB-DEP := install-shlib
SHLIB := libpq++.so.1
LDFLAGS_SL = -shared -soname $(SHLIB)
CFLAGS += $(CFLAGS_SL)
endif
ifeq ($(PORTNAME), hpux)
@ -55,7 +61,7 @@ ifeq ($(PORTNAME), hpux)
CFLAGS += $(CFLAGS_SL)
endif
all: $(LIBNAME).a $(SHLIB) install examples
all: $(LIBNAME).a $(SHLIB)
$(LIBNAME).a: $(OBJS)
ifdef MK_NO_LORDER
@ -88,15 +94,15 @@ LIBPGXXHEADERS = pgenv.h \
pglobject.h
install-headers: beforeinstall-headers $(MAINHEADER)
@$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(HEADERDIR)/$(MAINHEADER)
@$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(DESTDIR)/$(HEADERDIR)/$(MAINHEADER)
@for i in ${LIBPGXXHEADERS}; do \
echo "Installing $(LIBPGXXHEADERDIR)/$$i."; \
$(INSTALL) $(INSTLOPTS) $$i $(LIBPGXXHEADERDIR)/$$i; \
$(INSTALL) $(INSTLOPTS) $$i $(DESTDIR)/$(LIBPGXXHEADERDIR)/$$i; \
done
beforeinstall-headers:
@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
@if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
@if [ ! -d $(DESTDIR)/$(HEADERDIR) ]; then mkdir $(DESTDIR)/$(HEADERDIR); fi
@if [ ! -d $(DESTDIR)/$(LIBPGXXHEADERDIR) ]; then mkdir $(DESTDIR)/$(LIBPGXXHEADERDIR); fi
beforeinstall-lib:
@if [ ! -d $(DESTDIR)/$(LIBDIR) ] ; then mkdir $(DESTDIR)/$(LIBDIR); fi

9
src/interfaces/libpq++/man/Makefile
Unescape View File

@ -4,7 +4,7 @@
# Makefile for doc directory to install man pages
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.3 1997/09/16 18:47:36 momjian Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.4 1998/04/06 01:36:20 momjian Exp $
#
#-------------------------------------------------------------------------
@ -12,7 +12,6 @@ SRCDIR= ../../..
include ../../../Makefile.global
install:
-mkdir -p $(POSTMANDIR)
-mkdir $(POSTMANDIR)/man3
cp *.3* $(POSTMANDIR)/man3
-mkdir $(DESTDIR)$(POSTMANDIR)
-mkdir $(DESTDIR)$(POSTMANDIR)/man3
cp *.3* $(DESTDIR)$(POSTMANDIR)/man3

72
src/interfaces/libpq/Makefile.in
Unescape View File

@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.12 1998/04/06 01:16:43 momjian Exp $
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.13 1998/04/06 01:35:53 momjian Exp $
#
#-------------------------------------------------------------------------
@ -35,7 +35,7 @@ ifeq ($(PORTNAME), linux)
ifdef LINUX_ELF
install-shlib-dep := install-shlib
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
LDFLAGS_SL = -shared
LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)
CFLAGS += $(CFLAGS_SL)
endif
endif
@ -117,57 +117,57 @@ install-headers: beforeinstall-headers c.h \
$(SRCDIR)/include/libpq/libpq-fs.h $(SRCDIR)/include/lib/dllist.h \
$(SRCDIR)/include/utils/geo_decls.h libpq-fe.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/os.h \
$(HEADERDIR)/os.h
$(DESTDIR)$(HEADERDIR)/os.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/config.h \
$(HEADERDIR)/config.h
$(DESTDIR)$(HEADERDIR)/config.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres.h \
$(HEADERDIR)/postgres.h
$(DESTDIR)$(HEADERDIR)/postgres.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres_ext.h \
$(HEADERDIR)/postgres_ext.h
$(DESTDIR)$(HEADERDIR)/postgres_ext.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/pqcomm.h \
$(HEADERDIR)/libpq/pqcomm.h
$(DESTDIR)$(HEADERDIR)/libpq/pqcomm.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/libpq-fs.h \
$(HEADERDIR)/libpq/libpq-fs.h
$(DESTDIR)$(HEADERDIR)/libpq/libpq-fs.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/lib/dllist.h \
$(HEADERDIR)/lib/dllist.h
$(DESTDIR)$(HEADERDIR)/lib/dllist.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/geo_decls.h \
$(HEADERDIR)/utils/geo_decls.h
$(DESTDIR)$(HEADERDIR)/utils/geo_decls.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/elog.h \
$(HEADERDIR)/utils/elog.h
$(DESTDIR)$(HEADERDIR)/utils/elog.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/palloc.h \
$(HEADERDIR)/utils/palloc.h
$(DESTDIR)$(HEADERDIR)/utils/palloc.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/attnum.h \
$(HEADERDIR)/access/attnum.h
$(DESTDIR)$(HEADERDIR)/access/attnum.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/spi.h \
$(HEADERDIR)/executor/spi.h
$(DESTDIR)$(HEADERDIR)/executor/spi.h
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/commands/trigger.h \
$(HEADERDIR)/commands/trigger.h
$(INSTALL) $(INSTLOPTS) libpq-fe.h $(HEADERDIR)/libpq-fe.h
$(DESTDIR)$(HEADERDIR)/commands/trigger.h
$(INSTALL) $(INSTLOPTS) libpq-fe.h $(DESTDIR)$(HEADERDIR)/libpq-fe.h
ifeq ($(PORTNAME), hpux)
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/backend/port/hpux/fixade.h \
$(HEADERDIR)/port/hpux/fixade.h
$(DESTDIR)$(HEADERDIR)/port/hpux/fixade.h
endif
$(INSTALL) $(INSTLOPTS) c.h $(HEADERDIR)/c.h
$(INSTALL) $(INSTLOPTS) c.h $(DESTDIR)$(HEADERDIR)/c.h
beforeinstall-headers:
@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi
@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \
then mkdir $(HEADERDIR)/port/$(PORTNAME); fi
@if [ ! -d $(HEADERDIR)/include ]; \
then mkdir $(HEADERDIR)/include; fi
@if [ ! -d $(HEADERDIR)/lib ]; \
then mkdir $(HEADERDIR)/lib; fi
@if [ ! -d $(HEADERDIR)/libpq ]; \
then mkdir $(HEADERDIR)/libpq; fi
@if [ ! -d $(HEADERDIR)/utils ]; \
then mkdir $(HEADERDIR)/utils; fi
@if [ ! -d $(HEADERDIR)/access ]; \
then mkdir $(HEADERDIR)/access; fi
@if [ ! -d $(HEADERDIR)/executor ]; \
then mkdir $(HEADERDIR)/executor; fi
@if [ ! -d $(HEADERDIR)/commands ]; \
then mkdir $(HEADERDIR)/commands; fi
@if [ ! -d $(DESTDIR)$(HEADERDIR) ]; then mkdir $(DESTDIR)$(HEADERDIR); fi
@if [ ! -d $(DESTDIR)$(HEADERDIR)/port ]; then mkdir $(DESTDIR)$(HEADERDIR)/port; fi
@if [ ! -d $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME) ]; \
then mkdir $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME); fi
@if [ ! -d $(DESTDIR)$(HEADERDIR)/include ]; \
then mkdir $(DESTDIR)$(HEADERDIR)/include; fi
@if [ ! -d $(DESTDIR)$(HEADERDIR)/lib ]; \
then mkdir $(DESTDIR)$(HEADERDIR)/lib; fi
@if [ ! -d $(DESTDIR)$(HEADERDIR)/libpq ]; \
then mkdir $(DESTDIR)$(HEADERDIR)/libpq; fi
@if [ ! -d $(DESTDIR)$(HEADERDIR)/utils ]; \
then mkdir $(DESTDIR)$(HEADERDIR)/utils; fi
@if [ ! -d $(DESTDIR)$(HEADERDIR)/access ]; \
then mkdir $(DESTDIR)$(HEADERDIR)/access; fi
@if [ ! -d $(DESTDIR)$(HEADERDIR)/executor ]; \
then mkdir $(DESTDIR)$(HEADERDIR)/executor; fi
@if [ ! -d $(DESTDIR)$(HEADERDIR)/commands ]; \
then mkdir $(DESTDIR)$(HEADERDIR)/commands; fi
install-libpq: libpq.a
$(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a

23
src/interfaces/perl5/Makefile.PL
Unescape View File

@ -1,6 +1,6 @@
#-------------------------------------------------------
#
# $Id: Makefile.PL,v 1.5 1998/02/20 21:25:32 mergl Exp $
# $Id: Makefile.PL,v 1.6 1998/04/06 01:36:30 momjian Exp $
#
# Copyright (c) 1997 Edmund Mergl
#
@ -14,27 +14,12 @@ print "\nConfiguring Pg\n";
print "Remember to actually read the README file !\n";
die "\nYou didn't read the README file !\n" unless ($] >= 5.002);
if (! $ENV{POSTGRES_HOME}) {
warn "\$POSTGRES_HOME not defined. Searching for PostgreSQL...\n";
foreach(qw(/usr/local/pgsql /usr/pgsql /home/pgsql /opt/pgsql /usr/local/postgres /usr/postgres /home/postgres /opt/postgres)) {
if (-d "$_/lib") {
$ENV{POSTGRES_HOME} = $_;
last;
}
}
}
if (-d "$ENV{POSTGRES_HOME}/lib") {
print "Found PostgreSQL in $ENV{POSTGRES_HOME}\n";
} else {
die "Unable to determine PostgreSQL\n";
}
my %opts = (
NAME => 'Pg',
VERSION_FROM => 'Pg.pm',
INC => "-I$ENV{POSTGRES_HOME}/include",
LIBS => ["-L$ENV{POSTGRES_HOME}/lib -lpq"],
INC => "-I../libpq -I../../include",
LIBS => ["-L../libpq -lpq"],
CC => 'gcc',
);

2
src/makefiles/Makefile.linux
Unescape View File

@ -1,4 +1,4 @@
LDFLAGS+= -export-dynamic -Wl,-rpath -Wl,$(LIBDIR)
LDFLAGS+= -export-dynamic #-Wl,-rpath -Wl,$(DESTDIR)$(LIBDIR)
MK_NO_LORDER= true
%.so: %.o

20
src/man/Makefile
Unescape View File

@ -8,7 +8,7 @@
#
#
# IDENTIFICATION
# $Header: /cvsroot/pgsql/src/man/Attic/Makefile,v 1.4 1998/04/06 00:31:52 momjian Exp $
# $Header: /cvsroot/pgsql/src/man/Attic/Makefile,v 1.5 1998/04/06 01:36:41 momjian Exp $
#
#-------------------------------------------------------------------------
@ -16,15 +16,15 @@ SRCDIR=..
include ../Makefile.global
install:
-mkdir -p $(POSTMANDIR)
-mkdir -p $(POSTMANDIR)/man1
-mkdir -p $(POSTMANDIR)/man3
-mkdir -p $(POSTMANDIR)/man5
-mkdir -p $(POSTMANDIR)/manl
cp *.1* $(POSTMANDIR)/man1
cp *.3* $(POSTMANDIR)/man3
cp *.5* $(POSTMANDIR)/man5
cp *.l* $(POSTMANDIR)/manl
-mkdir $(DESTDIR)$(POSTMANDIR)
-mkdir $(DESTDIR)$(POSTMANDIR)/man1
-mkdir $(DESTDIR)$(POSTMANDIR)/man3
-mkdir $(DESTDIR)$(POSTMANDIR)/man5
-mkdir $(DESTDIR)$(POSTMANDIR)/manl
cp *.1* $(DESTDIR)$(POSTMANDIR)/man1
cp *.3* $(DESTDIR)$(POSTMANDIR)/man3
cp *.5* $(DESTDIR)$(POSTMANDIR)/man5
cp *.l* $(DESTDIR)$(POSTMANDIR)/manl
clean:

Write Preview
Loading…
Cancel
Save