Back out this for Peter:

bmomjian · bmomjian · commit 29731df47113 · 2002-03-11T04:39:14.000Z
&gt;       This simple patch fixes broken Makefile, broken ApplySnapshot and
&gt;       makes all utilities honour --verbose command line option.
&gt;
&gt;       --
&gt;       Yours, Alexey V. Borzov, Webmaster of RDW.ru
&gt;
diff --git 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' $< >$@
