Back out this for Peter:

>       This simple patch fixes broken Makefile, broken ApplySnapshot and
>       makes all utilities honour --verbose command line option.
>
>       --
>       Yours, Alexey V. Borzov, Webmaster of RDW.ru
>

diff --git a/contrib/rserv/Makefile b/contrib/rserv/Makefile
index 7a4cf72a57de0df516a3f6f16ad7252f235b262a..272511974665631937de647035a9c0f393056adf 100644 (file)
--- a/contrib/rserv/Makefile
+++ b/contrib/rserv/Makefile
@@ -22,10 +22,10 @@ override DLLLIBS := $(BE_DLLLIBS) $(DLLLIBS)
 all: $(SQLS) $(TCLS) $(PERLS) $(SCRIPTS) $(SONAME)
 
 %.sql: %.sql.in
-   sed 's,@MODULE_FILENAME@,$(pkglibdir)/$(SONAME),g' $< >$@
+   sed 's,@MODULE_FILENAME@,$$libdir/$(NAME),g' $< >$@
 
 $(PERLS) $(TCLS) $(SCRIPTS): %: %.in
-   sed -e 's,@MODULE_FILENAME@,$(pkglibdir)/$(SONAME),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' $< >$@