Skip to content

Commit da06bc1

Browse files
peterepetere
committed
Make building scripts kind of consistent in look and feel, kind of immune
to parallel make, kind of resistent to corruption due to incomplete builds.
1 parent f2bfe8a commit da06bc1

File tree

10 files changed

+40
-33
lines changed

10 files changed

+40
-33
lines changed

‎src/Makefile.global.in‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.92 2000/08/31 16:09:22 petere Exp $
1+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.93 2000/09/08 18:29:20 petere Exp $
22

33
#------------------------------------------------------------------------------
44
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -12,6 +12,11 @@
1212
# parent directory of the directory this file is in.)
1313
#------------------------------------------------------------------------------
1414

15+
# Delete target files if the command fails after it has
16+
# started to update the file.
17+
.DELETE_ON_ERROR:
18+
19+
1520
# PostgreSQL version number
1621
VERSION = @VERSION@
1722

@@ -294,7 +299,7 @@ COMPILE.c = $(CC) -c $(CPPFLAGS) $(CFLAGS)
294299

295300
autodepend = @autodepend@
296301

297-
ifdef autodepend
302+
ifeq ($(autodepend), yes)
298303

299304
DEPDIR = .deps
300305
df = $(DEPDIR)/$(*F)

‎src/bin/initdb/Makefile‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.22 2000/09/01 13:15:27 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/bin/initdb/Makefile,v 1.23 2000/09/08 18:29:21 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -15,14 +15,12 @@ include $(top_builddir)/src/Makefile.global
1515
all: initdb
1616

1717
initdb: initdb.sh $(top_builddir)/src/Makefile.global
18-
rm -f $@ $@.tmp
1918
sed -e 's/@MULTIBYTE@/$(MULTIBYTE)/g' \
2019
-e 's/@VERSION@/$(VERSION)/g' \
2120
-e 's,@bindir@,$(bindir),g' \
2221
-e 's,@datadir@,$(datadir),g' \
23-
$< >$@.tmp
24-
chmod a+x $@.tmp
25-
mv $@.tmp $@
22+
$< >$@
23+
chmod a+x $@
2624

2725
install: all installdirs
2826
$(INSTALL_SCRIPT) initdb $(bindir)/initdb

‎src/bin/initlocation/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.10 2000/08/31 16:11:07 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.11 2000/09/08 18:29:22 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -16,6 +16,7 @@ all: initlocation
1616

1717
initlocation: initlocation.sh
1818
cp $< $@
19+
chmod a+x $@
1920

2021
install: all installdirs
2122
$(INSTALL_SCRIPT) initlocation $(bindir)/initlocation

‎src/bin/ipcclean/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.12 2000/08/31 16:11:08 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.13 2000/09/08 18:29:23 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -16,6 +16,7 @@ all: ipcclean
1616

1717
ipcclean: ipcclean.sh
1818
cp $< $@
19+
chmod a+x $@
1920

2021
install: all installdirs
2122
$(INSTALL_SCRIPT) ipcclean $(bindir)/ipcclean

‎src/bin/pg-config/Makefile‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Header: /cvsroot/pgsql/src/bin/pg-config/Attic/Makefile,v 1.1 2000/08/26 13:08:16 petere Exp $
1+
# $Header: /cvsroot/pgsql/src/bin/pg-config/Attic/Makefile,v 1.2 2000/09/08 18:29:26 petere Exp $
22

33
subdir = src/bin/pg-config
44
top_builddir = ../../..
@@ -7,16 +7,14 @@ include $(top_builddir)/src/Makefile.global
77
all: pg-config
88

99
pg-config: pg-config.sh $(top_builddir)/config.status $(top_builddir)/src/Makefile.global Makefile
10-
rm -f $@ $@.tmp
1110
configure=`sed -n '7s,^# [^ ]*configure *,,p' $(top_builddir)/config.status` && \
1211
sed -e 's,@bindir@,$(bindir),g' \
1312
-e 's,@includedir@,$(includedir),g' \
1413
-e 's,@libdir@,$(libdir),g' \
1514
-e "s,@configure@,$$configure,g" \
1615
-e 's,@version@,$(VERSION),g' \
17-
$< >$@.tmp
18-
chmod a+x $@.tmp
19-
mv $@.tmp $@
16+
$< >$@
17+
chmod a+x $@
2018

2119
install: all installdirs
2220
$(INSTALL_SCRIPT) pg-config $(bindir)/pg-config

‎src/bin/pg_ctl/Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1999, PostgreSQL Global Development Group
66
#
7-
# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.7 2000/08/31 16:11:10 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/bin/pg_ctl/Makefile,v 1.8 2000/09/08 18:29:27 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -16,6 +16,7 @@ all: pg_ctl
1616

1717
pg_ctl: pg_ctl.sh
1818
cp $< $@
19+
chmod a+x $@
1920

2021
install: all installdirs
2122
$(INSTALL_SCRIPT) pg_ctl $(bindir)/pg_ctl

‎src/bin/pg_dump/Makefile‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.23 2000/08/31 16:11:13 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Makefile,v 1.24 2000/09/08 18:29:27 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -30,10 +30,11 @@ pg_restore: pg_restore.o $(OBJS) $(libpq_builddir)/libpq.a
3030
$(MAKE) -C ../../utils strdup.o
3131

3232
pg_dumpall: pg_dumpall.sh
33-
sed -e 's:__VERSION__:$(VERSION):g' \
34-
-e 's:__MULTIBYTE__:$(MULTIBYTE):g' \
35-
-e 's:__bindir__:$(bindir):g' \
36-
< $< > $@
33+
sed -e 's,@VERSION@,$(VERSION),g' \
34+
-e 's,@MULTIBYTE@,$(MULTIBYTE),g' \
35+
-e 's,@bindir@,$(bindir),g' \
36+
$< >$@
37+
chmod a+x $@
3738

3839
.PHONY: submake
3940
submake:

‎src/bin/pg_dump/pg_dumpall.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
# and "pg_group" tables, which belong to the whole installation rather
77
# than any one individual database.
88
#
9-
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.3 2000/07/04 16:29:59 petere Exp $
9+
# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/pg_dumpall.sh,v 1.4 2000/09/08 18:29:27 petere Exp $
1010

1111
CMDNAME=`basename $0`
1212

1313
# substituted at build
14-
VERSION='__VERSION__'
15-
MULTIBYTE='__MULTIBYTE__'
16-
bindir='__bindir__'
14+
VERSION='@VERSION@'
15+
MULTIBYTE='@MULTIBYTE@'
16+
bindir='@bindir@'
1717

1818
#
1919
# Find out where we're located

‎src/bin/scripts/Makefile‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Copyright (c) 1994, Regents of the University of California
66
#
7-
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.8 2000/08/31 16:11:25 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.9 2000/09/08 18:29:28 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -17,9 +17,10 @@ SCRIPTS := createdb dropdb createuser dropuser createlang droplang vacuumdb
1717
all: $(SCRIPTS)
1818

1919
createlang: createlang.sh
20-
sed -e 's:__DLSUFFIX__:$(DLSUFFIX):g' \
21-
-e 's:__libdir__:$(libdir):g' \
22-
$< > $@
20+
sed -e 's/@DLSUFFIX@/$(DLSUFFIX)/g' \
21+
-e 's,@libdir@,$(libdir),g' \
22+
$< >$@
23+
chmod a+x $@
2324

2425
install: all installdirs
2526
for i in $(SCRIPTS); do $(INSTALL_SCRIPT) $$i $(bindir) || exit; done

‎src/bin/scripts/createlang.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.14 2000/08/20 11:56:29 petere Exp $
11+
# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createlang.sh,v 1.15 2000/09/08 18:29:28 petere Exp $
1212
#
1313
#-------------------------------------------------------------------------
1414

@@ -160,7 +160,7 @@ fi
160160
# Check that we have PGLIB
161161
# ----------
162162
if [ -z "$PGLIB" ]; then
163-
PGLIB='__libdir__'
163+
PGLIB='@libdir@'
164164
fi
165165

166166
# ----------
@@ -206,13 +206,14 @@ case "$langname" in
206206
;;
207207
esac
208208

209+
DLSUFFIX='@DLSUFFIX@'
209210

210211
# ----------
211212
# Check that the shared object for the call handler is installed
212213
# in PGLIB
213214
# ----------
214-
if [ ! -f $PGLIB/${object}__DLSUFFIX__ ]; then
215-
echo "$CMDNAME: cannot find the file $PGLIB/${langname}__DLSUFFIX__"
215+
if [ ! -f "$PGLIB/$object$DLSUFFIX" ]; then
216+
echo "$CMDNAME: cannot find the file \`$PGLIB/$langname$DLSUFFIX'"
216217
echo ""
217218
echo "This file contains the call handler for $lancomp. By default,"
218219
echo "only PL/pgSQL is built and installed; other languages must be"
@@ -251,7 +252,7 @@ fi
251252
# ----------
252253
# Create the call handler and the language
253254
# ----------
254-
$PSQL "CREATE FUNCTION $handler () RETURNS OPAQUE AS '$PGLIB/${object}__DLSUFFIX__' LANGUAGE 'newC'"
255+
$PSQL "CREATE FUNCTION $handler () RETURNS OPAQUE AS '$PGLIB/${object}$DLSUFFIX' LANGUAGE 'newC'"
255256
if [ $? -ne 0 ]; then
256257
echo "$CMDNAME: language installation failed"
257258
exit 1

0 commit comments

Comments
 (0)