Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 066ee9a

Browse files
bmomjianbmomjian
committed
Make DESTDIR consistent, and verious Linux cleanups.
1 parent 5523beb commit 066ee9a

File tree

10 files changed

+88
-98
lines changed

10 files changed

+88
-98
lines changed

‎doc/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.5 1998/03/15 07:37:51 scrappy Exp $
11+
# $Header: /cvsroot/pgsql/doc/Makefile,v 1.6 1998/04/06 01:35:16 momjian Exp $
1212
#
1313
#----------------------------------------------------------------------------
1414

15-
PGDOCS= /usr/local/cdrom/docs
15+
PGDOCS= unpacked
1616
SRCDIR= ../src
1717

1818
TAR= tar

‎src/backend/Makefile

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#
3535
#
3636
# IDENTIFICATION
37-
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.30 1998/01/04 19:12:02 scrappy Exp $
37+
# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.31 1998/04/06 01:35:19 momjian Exp $
3838
#
3939
#-------------------------------------------------------------------------
4040

@@ -125,31 +125,31 @@ clean:
125125
# and (2) the parameters of a database system should be set at initdb time,
126126
# not at postgres build time.
127127

128-
install: $(LIBDIR) $(BINDIR) $(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
128+
install: $(DESTDIR)$(LIBDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(HEADERDIR) postgres $(POSTGRES_IMP) fmgr.h\
129129
global1.bki.source local1_template1.bki.source \
130130
global1.description local1_template1.description \
131131
libpq/pg_hba.conf.sample optimizer/geqo/pg_geqo.sample
132-
$(INSTALL) $(INSTL_EXE_OPTS) postgres $(BINDIR)/postgres
132+
$(INSTALL) $(INSTL_EXE_OPTS) postgres $(DESTDIR)$(BINDIR)/postgres
133133
ifeq ($(MAKE_EXPORTS), true)
134-
$(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)
134+
$(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(DESTDIR)$(LIBDIR)/$(POSTGRES_IMP)
135135
endif
136-
@rm -f $(BINDIR)/postmaster
137-
ln -s postgres $(BINDIR)/postmaster
138-
$(INSTALL) $(INSTLOPTS) fmgr.h $(HEADERDIR)/fmgr.h
136+
@rm -f $(DESTDIR)$(BINDIR)/postmaster
137+
ln -s postgres $(DESTDIR)$(BINDIR)/postmaster
138+
$(INSTALL) $(INSTLOPTS) fmgr.h $(DESTDIR)$(HEADERDIR)/fmgr.h
139139
$(INSTALL) $(INSTLOPTS) global1.bki.source \
140-
$(LIBDIR)/global1.bki.source
140+
$(DESTDIR)$(LIBDIR)/global1.bki.source
141141
$(INSTALL) $(INSTLOPTS) global1.description \
142-
$(LIBDIR)/global1.description
142+
$(DESTDIR)$(LIBDIR)/global1.description
143143
$(INSTALL) $(INSTLOPTS) local1_template1.bki.source \
144-
$(LIBDIR)/local1_template1.bki.source
144+
$(DESTDIR)$(LIBDIR)/local1_template1.bki.source
145145
$(INSTALL) $(INSTLOPTS) local1_template1.description \
146-
$(LIBDIR)/local1_template1.description
146+
$(DESTDIR)$(LIBDIR)/local1_template1.description
147147
$(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \
148-
$(LIBDIR)/pg_hba.conf.sample
148+
$(DESTDIR)$(LIBDIR)/pg_hba.conf.sample
149149
$(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \
150-
$(LIBDIR)/pg_geqo.sample
150+
$(DESTDIR)$(LIBDIR)/pg_geqo.sample
151151

152-
$(BINDIR) $(LIBDIR) $(HEADERDIR):
152+
$(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(HEADERDIR):
153153
mkdir $@
154154

155155
#############################################################################

‎src/interfaces/ecpg/lib/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ifeq ($(PORTNAME), linux)
1919
ifdef LINUX_ELF
2020
install-shlib-dep := install-shlib
2121
shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
22-
LDFLAGS_SL = -shared
22+
LDFLAGS_SL = -shared -soname libecpg.so.$(SO_MAJOR_VERSION)
2323
CFLAGS += $(CFLAGS_SL)
2424
endif
2525
endif

‎src/interfaces/libpgtcl/Makefile.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.9 1998/04/06 01:16:38 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.10 1998/04/06 01:35:43 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -88,10 +88,10 @@ $(shlib): $(OBJS)
8888
install: install-headers install-libpgtcl $(install-shlib-dep)
8989

9090
install-headers: beforeinstall-headers libpgtcl.h
91-
$(INSTALL) $(INSTLOPTS) libpgtcl.h $(HEADERDIR)/libpgtcl.h
91+
$(INSTALL) $(INSTLOPTS) libpgtcl.h $(DESTDIR)$(HEADERDIR)/libpgtcl.h
9292

9393
beforeinstall-headers:
94-
@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
94+
@if [ ! -d $(DESTDIR)$(HEADERDIR) ]; then mkdir $(DESTDIR)$(HEADERDIR); fi
9595

9696
install-libpgtcl: libpgtcl.a
9797
$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(DESTDIR)$(LIBDIR)/libpgtcl.a

‎src/interfaces/libpq++/Makefile

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.13 1998/04/06 01:16:47 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.14 1998/04/06 01:36:07 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -45,7 +45,13 @@ INSTALL-SHLIB-DEP :=
4545
ifeq ($(PORTNAME), i386_solaris)
4646
INSTALL-SHLIB-DEP := install-shlib
4747
SHLIB := libpq++.so.1
48-
LDFLAGS_SL = -G -z text
48+
LDFLAGS_SL = -G -z text -shared -soname $(SHLIB)
49+
CFLAGS += $(CFLAGS_SL)
50+
endif
51+
ifeq ($(PORTNAME), linux)
52+
INSTALL-SHLIB-DEP := install-shlib
53+
SHLIB := libpq++.so.1
54+
LDFLAGS_SL = -shared -soname $(SHLIB)
4955
CFLAGS += $(CFLAGS_SL)
5056
endif
5157
ifeq ($(PORTNAME), hpux)
@@ -55,7 +61,7 @@ ifeq ($(PORTNAME), hpux)
5561
CFLAGS += $(CFLAGS_SL)
5662
endif
5763

58-
all: $(LIBNAME).a $(SHLIB) install examples
64+
all: $(LIBNAME).a $(SHLIB)
5965

6066
$(LIBNAME).a: $(OBJS)
6167
ifdef MK_NO_LORDER
@@ -88,15 +94,15 @@ LIBPGXXHEADERS = pgenv.h \
8894
pglobject.h
8995

9096
install-headers: beforeinstall-headers $(MAINHEADER)
91-
@$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(HEADERDIR)/$(MAINHEADER)
97+
@$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(DESTDIR)/$(HEADERDIR)/$(MAINHEADER)
9298
@for i in ${LIBPGXXHEADERS}; do \
9399
echo "Installing $(LIBPGXXHEADERDIR)/$$i."; \
94-
$(INSTALL) $(INSTLOPTS) $$i $(LIBPGXXHEADERDIR)/$$i; \
100+
$(INSTALL) $(INSTLOPTS) $$i $(DESTDIR)/$(LIBPGXXHEADERDIR)/$$i; \
95101
done
96102

97103
beforeinstall-headers:
98-
@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
99-
@if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
104+
@if [ ! -d $(DESTDIR)/$(HEADERDIR) ]; then mkdir $(DESTDIR)/$(HEADERDIR); fi
105+
@if [ ! -d $(DESTDIR)/$(LIBPGXXHEADERDIR) ]; then mkdir $(DESTDIR)/$(LIBPGXXHEADERDIR); fi
100106

101107
beforeinstall-lib:
102108
@if [ ! -d $(DESTDIR)/$(LIBDIR) ] ; then mkdir $(DESTDIR)/$(LIBDIR); fi

‎src/interfaces/libpq++/man/Makefile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
# Makefile for doc directory to install man pages
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.3 1997/09/16 18:47:36 momjian Exp $
7+
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/man/Attic/Makefile,v 1.4 1998/04/06 01:36:20 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

1111
SRCDIR= ../../..
1212
include ../../../Makefile.global
1313

1414
install:
15-
-mkdir -p $(POSTMANDIR)
16-
-mkdir $(POSTMANDIR)/man3
17-
cp *.3* $(POSTMANDIR)/man3
18-
15+
-mkdir $(DESTDIR)$(POSTMANDIR)
16+
-mkdir $(DESTDIR)$(POSTMANDIR)/man3
17+
cp *.3* $(DESTDIR)$(POSTMANDIR)/man3

‎src/interfaces/libpq/Makefile.in

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.12 1998/04/06 01:16:43 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.13 1998/04/06 01:35:53 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -35,7 +35,7 @@ ifeq ($(PORTNAME), linux)
3535
ifdef LINUX_ELF
3636
install-shlib-dep := install-shlib
3737
shlib := libpq.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
38-
LDFLAGS_SL = -shared
38+
LDFLAGS_SL = -shared -soname libpq.so.$(SO_MAJOR_VERSION)
3939
CFLAGS += $(CFLAGS_SL)
4040
endif
4141
endif
@@ -117,57 +117,57 @@ install-headers: beforeinstall-headers c.h \
117117
$(SRCDIR)/include/libpq/libpq-fs.h $(SRCDIR)/include/lib/dllist.h \
118118
$(SRCDIR)/include/utils/geo_decls.h libpq-fe.h
119119
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/os.h \
120-
$(HEADERDIR)/os.h
120+
$(DESTDIR)$(HEADERDIR)/os.h
121121
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/config.h \
122-
$(HEADERDIR)/config.h
122+
$(DESTDIR)$(HEADERDIR)/config.h
123123
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres.h \
124-
$(HEADERDIR)/postgres.h
124+
$(DESTDIR)$(HEADERDIR)/postgres.h
125125
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres_ext.h \
126-
$(HEADERDIR)/postgres_ext.h
126+
$(DESTDIR)$(HEADERDIR)/postgres_ext.h
127127
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/pqcomm.h \
128-
$(HEADERDIR)/libpq/pqcomm.h
128+
$(DESTDIR)$(HEADERDIR)/libpq/pqcomm.h
129129
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/libpq-fs.h \
130-
$(HEADERDIR)/libpq/libpq-fs.h
130+
$(DESTDIR)$(HEADERDIR)/libpq/libpq-fs.h
131131
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/lib/dllist.h \
132-
$(HEADERDIR)/lib/dllist.h
132+
$(DESTDIR)$(HEADERDIR)/lib/dllist.h
133133
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/geo_decls.h \
134-
$(HEADERDIR)/utils/geo_decls.h
134+
$(DESTDIR)$(HEADERDIR)/utils/geo_decls.h
135135
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/elog.h \
136-
$(HEADERDIR)/utils/elog.h
136+
$(DESTDIR)$(HEADERDIR)/utils/elog.h
137137
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/palloc.h \
138-
$(HEADERDIR)/utils/palloc.h
138+
$(DESTDIR)$(HEADERDIR)/utils/palloc.h
139139
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/attnum.h \
140-
$(HEADERDIR)/access/attnum.h
140+
$(DESTDIR)$(HEADERDIR)/access/attnum.h
141141
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/spi.h \
142-
$(HEADERDIR)/executor/spi.h
142+
$(DESTDIR)$(HEADERDIR)/executor/spi.h
143143
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/commands/trigger.h \
144-
$(HEADERDIR)/commands/trigger.h
145-
$(INSTALL) $(INSTLOPTS) libpq-fe.h $(HEADERDIR)/libpq-fe.h
144+
$(DESTDIR)$(HEADERDIR)/commands/trigger.h
145+
$(INSTALL) $(INSTLOPTS) libpq-fe.h $(DESTDIR)$(HEADERDIR)/libpq-fe.h
146146
ifeq ($(PORTNAME), hpux)
147147
$(INSTALL) $(INSTLOPTS) $(SRCDIR)/backend/port/hpux/fixade.h \
148-
$(HEADERDIR)/port/hpux/fixade.h
148+
$(DESTDIR)$(HEADERDIR)/port/hpux/fixade.h
149149
endif
150-
$(INSTALL) $(INSTLOPTS) c.h $(HEADERDIR)/c.h
150+
$(INSTALL) $(INSTLOPTS) c.h $(DESTDIR)$(HEADERDIR)/c.h
151151

152152
beforeinstall-headers:
153-
@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
154-
@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi
155-
@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \
156-
then mkdir $(HEADERDIR)/port/$(PORTNAME); fi
157-
@if [ ! -d $(HEADERDIR)/include ]; \
158-
then mkdir $(HEADERDIR)/include; fi
159-
@if [ ! -d $(HEADERDIR)/lib ]; \
160-
then mkdir $(HEADERDIR)/lib; fi
161-
@if [ ! -d $(HEADERDIR)/libpq ]; \
162-
then mkdir $(HEADERDIR)/libpq; fi
163-
@if [ ! -d $(HEADERDIR)/utils ]; \
164-
then mkdir $(HEADERDIR)/utils; fi
165-
@if [ ! -d $(HEADERDIR)/access ]; \
166-
then mkdir $(HEADERDIR)/access; fi
167-
@if [ ! -d $(HEADERDIR)/executor ]; \
168-
then mkdir $(HEADERDIR)/executor; fi
169-
@if [ ! -d $(HEADERDIR)/commands ]; \
170-
then mkdir $(HEADERDIR)/commands; fi
153+
@if [ ! -d $(DESTDIR)$(HEADERDIR) ]; then mkdir $(DESTDIR)$(HEADERDIR); fi
154+
@if [ ! -d $(DESTDIR)$(HEADERDIR)/port ]; then mkdir $(DESTDIR)$(HEADERDIR)/port; fi
155+
@if [ ! -d $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME) ]; \
156+
then mkdir $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME); fi
157+
@if [ ! -d $(DESTDIR)$(HEADERDIR)/include ]; \
158+
then mkdir $(DESTDIR)$(HEADERDIR)/include; fi
159+
@if [ ! -d $(DESTDIR)$(HEADERDIR)/lib ]; \
160+
then mkdir $(DESTDIR)$(HEADERDIR)/lib; fi
161+
@if [ ! -d $(DESTDIR)$(HEADERDIR)/libpq ]; \
162+
then mkdir $(DESTDIR)$(HEADERDIR)/libpq; fi
163+
@if [ ! -d $(DESTDIR)$(HEADERDIR)/utils ]; \
164+
then mkdir $(DESTDIR)$(HEADERDIR)/utils; fi
165+
@if [ ! -d $(DESTDIR)$(HEADERDIR)/access ]; \
166+
then mkdir $(DESTDIR)$(HEADERDIR)/access; fi
167+
@if [ ! -d $(DESTDIR)$(HEADERDIR)/executor ]; \
168+
then mkdir $(DESTDIR)$(HEADERDIR)/executor; fi
169+
@if [ ! -d $(DESTDIR)$(HEADERDIR)/commands ]; \
170+
then mkdir $(DESTDIR)$(HEADERDIR)/commands; fi
171171

172172
install-libpq: libpq.a
173173
$(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a

‎src/interfaces/perl5/Makefile.PL

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#-------------------------------------------------------
22
#
3-
# $Id: Makefile.PL,v 1.5 1998/02/20 21:25:32 mergl Exp $
3+
# $Id: Makefile.PL,v 1.6 1998/04/06 01:36:30 momjian Exp $
44
#
55
# Copyright (c) 1997 Edmund Mergl
66
#
@@ -14,27 +14,12 @@ print "\nConfiguring Pg\n";
1414
print "Remember to actually read the README file !\n";
1515
die "\nYou didn't read the README file !\n" unless ($] >= 5.002);
1616

17-
if (! $ENV{POSTGRES_HOME}) {
18-
warn "\$POSTGRES_HOME not defined. Searching for PostgreSQL...\n";
19-
foreach(qw(/usr/local/pgsql /usr/pgsql /home/pgsql /opt/pgsql /usr/local/postgres /usr/postgres /home/postgres /opt/postgres)) {
20-
if (-d "$_/lib") {
21-
$ENV{POSTGRES_HOME} = $_;
22-
last;
23-
}
24-
}
25-
}
26-
27-
if (-d "$ENV{POSTGRES_HOME}/lib") {
28-
print "Found PostgreSQL in $ENV{POSTGRES_HOME}\n";
29-
} else {
30-
die "Unable to determine PostgreSQL\n";
31-
}
32-
3317
my %opts = (
3418
NAME => 'Pg',
3519
VERSION_FROM => 'Pg.pm',
36-
INC => "-I$ENV{POSTGRES_HOME}/include",
37-
LIBS => ["-L$ENV{POSTGRES_HOME}/lib -lpq"],
20+
INC => "-I../libpq -I../../include",
21+
LIBS => ["-L../libpq -lpq"],
22+
CC => 'gcc',
3823
);
3924

4025

‎src/makefiles/Makefile.linux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LDFLAGS+= -export-dynamic -Wl,-rpath -Wl,$(LIBDIR)
1+
LDFLAGS+= -export-dynamic #-Wl,-rpath -Wl,$(DESTDIR)$(LIBDIR)
22
MK_NO_LORDER= true
33

44
%.so: %.o

‎src/man/Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/src/man/Attic/Makefile,v 1.4 1998/04/06 00:31:52 momjian Exp $
11+
# $Header: /cvsroot/pgsql/src/man/Attic/Makefile,v 1.5 1998/04/06 01:36:41 momjian Exp $
1212
#
1313
#-------------------------------------------------------------------------
1414

1515
SRCDIR=..
1616
include ../Makefile.global
1717

1818
install:
19-
-mkdir -p $(POSTMANDIR)
20-
-mkdir -p $(POSTMANDIR)/man1
21-
-mkdir -p $(POSTMANDIR)/man3
22-
-mkdir -p $(POSTMANDIR)/man5
23-
-mkdir -p $(POSTMANDIR)/manl
24-
cp *.1* $(POSTMANDIR)/man1
25-
cp *.3* $(POSTMANDIR)/man3
26-
cp *.5* $(POSTMANDIR)/man5
27-
cp *.l* $(POSTMANDIR)/manl
19+
-mkdir $(DESTDIR)$(POSTMANDIR)
20+
-mkdir $(DESTDIR)$(POSTMANDIR)/man1
21+
-mkdir $(DESTDIR)$(POSTMANDIR)/man3
22+
-mkdir $(DESTDIR)$(POSTMANDIR)/man5
23+
-mkdir $(DESTDIR)$(POSTMANDIR)/manl
24+
cp *.1* $(DESTDIR)$(POSTMANDIR)/man1
25+
cp *.3* $(DESTDIR)$(POSTMANDIR)/man3
26+
cp *.5* $(DESTDIR)$(POSTMANDIR)/man5
27+
cp *.l* $(DESTDIR)$(POSTMANDIR)/manl
2828

2929
clean:
3030

0 commit comments

Comments
 (0)