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

Commit 5523beb

Browse files
bmomjianbmomjian
committed
Re-introduce $DISTDIR.
1 parent 47364f3 commit 5523beb

File tree

21 files changed

+59
-59
lines changed

21 files changed

+59
-59
lines changed

‎src/bin/cleardbdir/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/cleardbdir/Attic/Makefile,v 1.6 1998/04/06 00:27:55 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/cleardbdir/Attic/Makefile,v 1.7 1998/04/06 01:14:10 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -20,7 +20,7 @@ cleardbdir:
2020
cp cleardbdir.sh cleardbdir
2121

2222
install: cleardbdir
23-
$(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
23+
$(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
2424

2525
clean:
2626
rm -f cleardbdir

‎src/bin/createdb/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/createdb/Attic/Makefile,v 1.6 1998/04/06 00:28:04 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/createdb/Attic/Makefile,v 1.7 1998/04/06 01:14:13 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -20,7 +20,7 @@ createdb: createdb.sh
2020
cp createdb.sh createdb
2121

2222
install: createdb
23-
$(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
23+
$(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
2424

2525
clean:
2626
rm -f createdb

‎src/bin/createuser/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/Makefile,v 1.6 1998/04/06 00:28:16 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/Makefile,v 1.7 1998/04/06 01:14:18 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -24,7 +24,7 @@ createuser: createuser.sh
2424
sed $(SEDSCRIPT) <createuser.sh >createuser
2525

2626
install: createuser
27-
$(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
27+
$(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
2828

2929
clean:
3030
rm -f createuser

‎src/bin/destroydb/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/Makefile,v 1.6 1998/04/06 00:28:25 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/Makefile,v 1.7 1998/04/06 01:14:26 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -20,7 +20,7 @@ destroydb: destroydb.sh
2020
cp destroydb.sh destroydb
2121

2222
install: destroydb
23-
$(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
23+
$(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
2424

2525
clean:
2626
rm -f destroydb

‎src/bin/destroyuser/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/Makefile,v 1.6 1998/04/06 00:28:37 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/Makefile,v 1.7 1998/04/06 01:14:36 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -24,7 +24,7 @@ destroyuser: destroyuser.sh
2424
sed $(SEDSCRIPT) <destroyuser.sh >destroyuser
2525

2626
install: destroyuser
27-
$(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
27+
$(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
2828

2929
clean:
3030
rm -f destroyuser

‎src/bin/initdb/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.6 1998/04/06 00:28:46 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.7 1998/04/06 01:14:46 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -17,7 +17,7 @@ include ../../Makefile.global
1717
all: initdb
1818

1919
install: initdb
20-
$(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
20+
$(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
2121

2222
clean:
2323
rm -f initdb

‎src/bin/initlocation/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.3 1998/04/06 00:29:00 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.4 1998/04/06 01:15:01 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -24,7 +24,7 @@ initlocation: initlocation.sh
2424
cp -p initlocation.sh initlocation
2525

2626
install: initlocation
27-
$(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
27+
$(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
2828

2929
clean:
3030
rm -f initlocation

‎src/bin/ipcclean/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.5 1998/04/06 00:29:03 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.6 1998/04/06 01:15:09 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -23,7 +23,7 @@ ipcclean:
2323
sed $(SEDSCRIPT) <ipcclean.sh >ipcclean
2424

2525
install: ipcclean
26-
$(INSTALL) $(INSTL_EXE_OPTS) $< $(BINDIR)/$<
26+
$(INSTALL) $(INSTL_EXE_OPTS) $< $(DESTDIR)$(BINDIR)/$<
2727

2828
clean:
2929
rm -f ipcclean

‎src/bin/pg_dump/Makefile.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.7 1998/04/06 00:29:08 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/Makefile.in,v 1.8 1998/04/06 01:15:16 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -39,8 +39,8 @@ submake:
3939
$(MAKE) -C $(LIBPQDIR) libpq.a
4040

4141
install: pg_dump
42-
$(INSTALL) $(INSTL_EXE_OPTS) pg_dump $(BINDIR)/pg_dump
43-
$(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(BINDIR)/pg_dumpall
42+
$(INSTALL) $(INSTL_EXE_OPTS) pg_dump $(DESTDIR)$(BINDIR)/pg_dump
43+
$(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(DESTDIR)$(BINDIR)/pg_dumpall
4444

4545
depend dep:
4646
$(CC) -MM $(CFLAGS) *.c >depend

‎src/bin/pg_id/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.9 1998/04/06 00:29:14 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pg_id/Attic/Makefile,v 1.10 1998/04/06 01:15:24 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -33,7 +33,7 @@ $(LIBPQDIR)/libpq.a:
3333
$(MAKE) -C $(LIBPQDIR) libpq.a
3434

3535
install: pg_id
36-
$(INSTALL) $(INSTL_EXE_OPTS) pg_id $(BINDIR)/pg_id
36+
$(INSTALL) $(INSTL_EXE_OPTS) pg_id $(DESTDIR)$(BINDIR)/pg_id
3737

3838
depend dep:
3939
$(CC) -MM $(CFLAGS) *.c >depend

‎src/bin/pg_passwd/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pg_passwd: $(OBJS)
1515
$(CC) -o pg_passwd $(OBJS) $(LDFLAGS)
1616

1717
install: pg_passwd
18-
$(INSTALL) $(INSTL_EXE_OPTS) pg_passwd $(BINDIR)/pg_passwd
18+
$(INSTALL) $(INSTL_EXE_OPTS) pg_passwd $(DESTDIR)$(BINDIR)/pg_passwd
1919

2020
.PHONY: submake
2121
submake:

‎src/bin/pg_version/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.3 1998/04/06 00:29:36 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pg_version/Attic/Makefile.in,v 1.4 1998/04/06 01:15:44 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -28,7 +28,7 @@ submake:
2828
$(MAKE) -C ../../utils version.o
2929

3030
install: pg_version
31-
$(INSTALL) $(INSTL_EXE_OPTS) pg_version $(BINDIR)/pg_version
31+
$(INSTALL) $(INSTL_EXE_OPTS) pg_version $(DESTDIR)$(BINDIR)/pg_version
3232

3333
depend dep:
3434
$(CC) -MM $(CFLAGS) *.c >depend

‎src/bin/pgtclsh/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.15 1998/04/06 00:29:46 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.16 1998/04/06 01:15:51 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -37,8 +37,8 @@ pgtksh: pgtkAppInit.o
3737
$(X11_LIBS) -lm $(LDFLAGS)
3838

3939
install: pgtclsh pgtksh
40-
$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(BINDIR)/pgtclsh
41-
$(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(BINDIR)/pgtksh
40+
$(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh
41+
$(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(DESTDIR)$(BINDIR)/pgtksh
4242

4343
clean:
4444
rm -f pgtclAppInit.o pgtkAppInit.o pgtclsh pgtksh

‎src/bin/psql/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.9 1998/04/06 00:29:56 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.10 1998/04/06 01:15:55 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -39,7 +39,7 @@ submake:
3939
$(MAKE) -C $(LIBPQDIR) libpq.a
4040

4141
install: psql
42-
$(INSTALL) $(INSTL_EXE_OPTS) psql $(BINDIR)/psql
42+
$(INSTALL) $(INSTL_EXE_OPTS) psql $(DESTDIR)$(BINDIR)/psql
4343

4444
depend dep:
4545
$(CC) -MM $(CFLAGS) *.c >depend

‎src/interfaces/ecpg/include/Makefile

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ all clean::
66
@echo Nothing to be done.
77

88
install::
9-
$(INSTALL) $(INSTLOPTS) ecpglib.h $(HEADERDIR)
10-
$(INSTALL) $(INSTLOPTS) ecpgtype.h $(HEADERDIR)
11-
$(INSTALL) $(INSTLOPTS) sqlca.h $(HEADERDIR)
9+
$(INSTALL) $(INSTLOPTS) ecpglib.h $(DESTDIR)$(HEADERDIR)
10+
$(INSTALL) $(INSTLOPTS) ecpgtype.h $(DESTDIR)$(HEADERDIR)
11+
$(INSTALL) $(INSTLOPTS) sqlca.h $(DESTDIR)$(HEADERDIR)
1212

1313
uninstall::
14-
rm -f $(HEADERDIR)/ecpglib.h
15-
rm -f $(HEADERDIR)/ecpgtype.h
16-
rm -f $(HEADERDIR)/sqlca.h
14+
rm -f $(DESTDIR)$(HEADERDIR)/ecpglib.h
15+
rm -f $(DESTDIR)$(HEADERDIR)/ecpgtype.h
16+
rm -f $(DESTDIR)$(HEADERDIR)/sqlca.h
1717

1818
dep depend:

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ clean:
5656
dep depend:
5757

5858
install: libecpg.a $(shlib) $(install-shlib-dep)
59-
$(INSTALL) $(INSTLOPTS) libecpg.a $(LIBDIR)
59+
$(INSTALL) $(INSTLOPTS) libecpg.a $(DESTDIR)$(LIBDIR)
6060

6161
install-shlib:
62-
$(INSTALL) $(INSTLOPTS) $(shlib) $(LIBDIR)
63-
ln -sf $(shlib) $(LIBDIR)/libecpg.so
62+
$(INSTALL) $(INSTLOPTS) $(shlib) $(DESTDIR)$(LIBDIR)
63+
ln -sf $(shlib) $(DESTDIR)$(LIBDIR)/libecpg.so
6464

6565
uninstall::
66-
rm -f $(LIBDIR)/libecpg.a $(LIBDIR)/$(shlib)
66+
rm -f $(DESTDIR)$(LIBDIR)/libecpg.a $(DESTDIR)$(LIBDIR)/$(shlib)
6767

6868
# Rules that do something
6969
libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)

‎src/interfaces/ecpg/preproc/Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ PATCHLEVEL=0
77

88
CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
99
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
10-
-DINCLUDE_PATH=\"$(HEADERDIR)\"
10+
-DINCLUDE_PATH=\"$(DESTDIR)$(HEADERDIR)\"
1111

1212
all:: ecpg
1313

1414
clean:
1515
rm -f *.o core a.out ecpg y.tab.h y.tab.c pgc.c *~
1616

1717
install: all
18-
$(INSTALL) $(INSTL_EXE_OPTS) ecpg $(BINDIR)
18+
$(INSTALL) $(INSTL_EXE_OPTS) ecpg $(DESTDIR)$(BINDIR)
1919

2020
uninstall:
21-
rm -f $(BINDIR)/ecpg
21+
rm -f $(DESTDIR)$(BINDIR)/ecpg
2222

2323
dep depend:
2424
$(CC) -MM $(CFLAGS) *.c > depend

‎src/interfaces/libpgtcl/Makefile.in

+4-4
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.8 1998/04/06 00:30:46 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.9 1998/04/06 01:16:38 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

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

9696
install-libpgtcl: libpgtcl.a
97-
$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(LIBDIR)/libpgtcl.a
97+
$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(DESTDIR)$(LIBDIR)/libpgtcl.a
9898

9999
install-shlib: $(shlib)
100100
$(INSTALL) $(INSTL_LIB_OPTS) $(shlib) \
101-
$(LIBDIR)/$(shlib)
102-
ln -sf $(shlib) $(LIBDIR)/libpgtcl.so
101+
$(DESTDIR)$(LIBDIR)/$(shlib)
102+
ln -sf $(shlib) $(DESTDIR)$(LIBDIR)/libpgtcl.so
103103

104104
.PHONY: clean
105105
clean:

‎src/interfaces/libpq++/Makefile

+6-6
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.12 1998/04/06 00:31:13 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.13 1998/04/06 01:16:47 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -99,15 +99,15 @@ beforeinstall-headers:
9999
@if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
100100

101101
beforeinstall-lib:
102-
@if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR); fi
102+
@if [ ! -d $(DESTDIR)/$(LIBDIR) ] ; then mkdir $(DESTDIR)/$(LIBDIR); fi
103103

104104
install-$(LIBNAME): $(LIBNAME).a beforeinstall-lib
105-
$(INSTALL) $(INSTL_LIB_OPTS) $(LIBNAME).a $(LIBDIR)/$(LIBNAME).a
105+
$(INSTALL) $(INSTL_LIB_OPTS) $(LIBNAME).a $(DESTDIR)$(LIBDIR)/$(LIBNAME).a
106106

107107
install-shlib: $(SHLIBNAME) beforeinstall-lib
108-
$(INSTALL) $(INSTL_SHLIB_OPTS) $(SHLIB) $(LIBDIR)/$(SHLIB)
109-
rm -f $(LIBDIR)/libpq++.so
110-
ln -sf $(SHLIB) $(LIBDIR)/libpq++.so
108+
$(INSTALL) $(INSTL_SHLIB_OPTS) $(SHLIB) $(DESTDIR)/$(LIBDIR)/$(SHLIB)
109+
rm -f $(DESTDIR)/$(LIBDIR)/libpq++.so
110+
ln -sf $(SHLIB) $(DESTDIR)/$(LIBDIR)/libpq++.so
111111

112112

113113
doc:

‎src/interfaces/libpq/Makefile.in

+5-5
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.11 1998/04/06 00:30:58 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.12 1998/04/06 01:16:43 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -170,12 +170,12 @@ beforeinstall-headers:
170170
then mkdir $(HEADERDIR)/commands; fi
171171

172172
install-libpq: libpq.a
173-
$(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(LIBDIR)/libpq.a
173+
$(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a
174174

175175
install-shlib: $(shlib)
176-
$(INSTALL) $(INSTL_LIB_OPTS) $(shlib) $(LIBDIR)/$(shlib)
177-
rm -f $(LIBDIR)/libpq.so
178-
ln -s $(shlib) $(LIBDIR)/libpq.so
176+
$(INSTALL) $(INSTL_LIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)/$(shlib)
177+
rm -f $(DESTDIR)$(LIBDIR)/libpq.so
178+
ln -s $(shlib) $(DESTDIR)$(LIBDIR)/libpq.so
179179

180180
depend dep:
181181
$(CC) -MM $(CFLAGS) *.c >depend

0 commit comments

Comments
 (0)