diff options
Diffstat (limited to 'contrib/rserv')
| -rw-r--r-- | contrib/rserv/Makefile | 16 | ||||
| -rw-r--r-- | contrib/rserv/MasterInit.in | 6 | ||||
| -rw-r--r-- | contrib/rserv/master.sql.in | 6 |
3 files changed, 13 insertions, 15 deletions
diff --git a/contrib/rserv/Makefile b/contrib/rserv/Makefile index 7306759b30c..27251197466 100644 --- a/contrib/rserv/Makefile +++ b/contrib/rserv/Makefile @@ -22,15 +22,13 @@ override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS) all: $(SQLS) $(TCLS) $(PERLS) $(SCRIPTS) $(SONAME) %.sql: %.sql.in - sed -e "s:_OBJWD_:$(libdir)/contrib:g" \ - -e "s:_DLSUFFIX_:$(DLSUFFIX):g" $< >$@ + sed 's,@MODULE_FILENAME@,$$libdir/$(NAME),g' $< >$@ $(PERLS) $(TCLS) $(SCRIPTS): %: %.in - sed -e "s:_OBJWD_:$(libdir)/contrib:g" \ - -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \ - -e "s:@SQLDIR@:$(datadir)/contrib:g" \ - -e "s:@BINDIR@:$(bindir):g" \ - -e "s:@LIBDIR@:$(datadir)/contrib:g" $< >$@ + sed -e 's,@MODULE_FILENAME@,$$libdir/$(NAME),g' \ + -e 's:@SQLDIR@:$(datadir)/contrib:g' \ + -e 's:@BINDIR@:$(bindir):g' \ + -e 's:@LIBDIR@:$(datadir)/contrib:g' $< >$@ chmod a+x $@ @@ -42,12 +40,12 @@ install: all installdirs $(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir) || exit ; \ done $(INSTALL_DATA) $(srcdir)/RServ.pm $(DESTDIR)$(datadir)/contrib - $(INSTALL_SHLIB) $(SONAME) $(DESTDIR)$(libdir)/contrib + $(INSTALL_SHLIB) $(SONAME) $(DESTDIR)$(pkglibdir) $(INSTALL_DATA) $(srcdir)/README.$(NAME) $(DESTDIR)$(docdir)/contrib installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/contrib \ - $(DESTDIR)$(libdir)/contrib $(DESTDIR)$(docdir)/contrib + $(DESTDIR)$(pkglibdir) $(DESTDIR)$(docdir)/contrib clean distclean maintainer-clean: diff --git a/contrib/rserv/MasterInit.in b/contrib/rserv/MasterInit.in index 9464424fa2d..68854c743a7 100644 --- a/contrib/rserv/MasterInit.in +++ b/contrib/rserv/MasterInit.in @@ -90,15 +90,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 opaque" . - " AS '_OBJWD_/rserv_DLSUFFIX_' 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 '_OBJWD_/rserv_DLSUFFIX_' 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 '_OBJWD_/rserv_DLSUFFIX_' LANGUAGE 'c'"); + " AS '@MODULE_FILENAME@' LANGUAGE 'c'"); RollbackAndQuit($conn) if ($result->resultStatus ne PGRES_COMMAND_OK); $result = $conn->exec("COMMIT"); diff --git a/contrib/rserv/master.sql.in b/contrib/rserv/master.sql.in index e52fc576077..f8d37148b99 100644 --- a/contrib/rserv/master.sql.in +++ b/contrib/rserv/master.sql.in @@ -80,7 +80,7 @@ drop function _rserv_log_(); CREATE FUNCTION _rserv_log_() RETURNS opaque - AS '_OBJWD_/rserv_DLSUFFIX_' + AS '@MODULE_FILENAME@' LANGUAGE 'c' ; @@ -88,7 +88,7 @@ drop function _rserv_sync_(int4); CREATE FUNCTION _rserv_sync_(int4) RETURNS int4 - AS '_OBJWD_/rserv_DLSUFFIX_' + AS '@MODULE_FILENAME@' LANGUAGE 'c' ; @@ -96,6 +96,6 @@ drop function _rserv_debug_(int4); CREATE FUNCTION _rserv_debug_(int4) RETURNS int4 - AS '_OBJWD_/rserv_DLSUFFIX_' + AS '@MODULE_FILENAME@' LANGUAGE 'c' ; |