diff options
| author | Bruce Momjian <bruce@momjian.us> | 2002-10-09 16:23:55 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2002-10-09 16:23:55 +0000 |
| commit | 0215dc9b0f2b0f8cdd22642cf93694fc101ab93e (patch) | |
| tree | 2ee9ddcdcf4c04816894ff80dd01f3006d0b6d93 /contrib/rserv/MasterInit.in | |
| parent | 33a6b67b517e55908fa8ad96d5e8a3aaac5c751d (diff) | |
| download | postgresql-0215dc9b0f2b0f8cdd22642cf93694fc101ab93e.tar.gz | |
Well, this patch makes Makefile for contrib/rserv use the
contrib/contrib-global.mk library and _generally_ behave like
Makefiles for other contrib modules.
Besides it fixes Perl's interpolation of $libdir variable, which
should be passed to backend instead. This patch is done against
PostgreSQL 7.3b2
Besides, I want to thank Peter Eisentraut for his very friendly and
helpful attitude and politely ask him to check whether contrib
modules actually continue to work after he implements another
major change to their build process.
Alexey Borzov
Diffstat (limited to 'contrib/rserv/MasterInit.in')
| -rw-r--r-- | contrib/rserv/MasterInit.in | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/rserv/MasterInit.in b/contrib/rserv/MasterInit.in index 1bfe1c9776..0c9b648c21 100644 --- a/contrib/rserv/MasterInit.in +++ b/contrib/rserv/MasterInit.in @@ -22,6 +22,8 @@ if (defined($opt_help) || (scalar(@ARGV) < 1)) { exit ((scalar(@ARGV) < 1)? 1:0); } +my $module_filename = '@MODULE_FILENAME@'; + my $master = $ARGV[0] || "master"; my $minfo = "dbname=$master"; @@ -90,15 +92,15 @@ $result = $conn->exec("create sequence _rserv_sync_seq_"); RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK); $result = $conn->exec("CREATE FUNCTION _rserv_log_() RETURNS trigger" . - " AS '@MODULE_FILENAME@' LANGUAGE 'c'"); + " AS '$module_filename' LANGUAGE 'c'"); RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK); $result = $conn->exec("CREATE FUNCTION _rserv_sync_(int4) RETURNS int4" . - " AS '@MODULE_FILENAME@' LANGUAGE 'c'"); + " AS '$module_filename' LANGUAGE 'c'"); RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK); $result = $conn->exec("CREATE FUNCTION _rserv_debug_(int4) RETURNS int4" . - " AS '@MODULE_FILENAME@' LANGUAGE 'c'"); + " AS '$module_filename' LANGUAGE 'c'"); RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK); $result = $conn->exec("COMMIT"); |