summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2014-07-03 14:01:52 +0200
committerPavel Raiskup <praiskup@redhat.com>2014-07-03 14:04:03 +0200
commitae8bfd7109395216ebb802499084fe890038a78f (patch)
tree1d4c4110f6600d17c174f26ad15be573b4be945d /Makefile.am
parentd83a864291c9f113d27bfb90d21fede7c35cdcf3 (diff)
downloadpostgresql-setup-ae8bfd7109395216ebb802499084fe890038a78f.tar.gz
postgresql-setup-ae8bfd7109395216ebb802499084fe890038a78f.tar.xz
postgresql-setup-ae8bfd7109395216ebb802499084fe890038a78f.zip
upgrade/initdb logs: diverge among service names
Generate separate log file for each service. Also, don't configure with INITDB_LOG or UPGRADE_LOG but rather with POSTGRES_HOME.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 64868f7..e4d6907 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@ nodist_pgdoc_DATA = README.rpm-dist
# need fully expanded strings there.
edit = $(SED) \
-e 's|@DISTSUFF[@]|$(DISTSUFF)|g' \
- -e 's|@INITDB_LOG[@]|$(INITDB_LOG)|g' \
-e 's|@libexecdir[@]|$(libexecdir)|g' \
-e 's|@PG_CTL_BIN[@]|$(PG_CTL_BIN)|g' \
-e 's|@PGDATADIR[@]|$(PGDATADIR)|g' \
@@ -27,11 +26,11 @@ edit = $(SED) \
-e 's|@PGMAJORVERSION[@]|$(PGMAJORVERSION)|g' \
-e 's|@PGVERSION[@]|$(PGVERSION)|g' \
-e 's|@PKGCONFIG_DIR[@]|$(PKGCONFIG_DIR)|g' \
+ -e 's|@POSTGRES_HOMEDIR[@]|$(POSTGRES_HOMEDIR)|g' \
-e 's|@PREVMAJORVERSION[@]|$(PREVMAJORVERSION)|g' \
-e 's|@PREVPGENGINE[@]|$(PREVPGENGINE)|g' \
-e 's|@README_DIST[@]|$(README_DIST)|g' \
-e 's|@SU[@]|$(SU)|g' \
- -e 's|@UPGRADE_LOG[@]|$(UPGRADE_LOG)|g' \
-e 's|@VERSION[@]|$(VERSION)|g' \
$< > $@