From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 11 Mar 2002 04:39:14 +0000 (+0000)
Subject: Back out this for Peter:
X-Git-Tag: REL7_3~1909
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29731df47113c5a600cf6ea089b4a3576d49e7f2;p=thirdparty%2Fpostgresql.git

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 7a4cf72a57d..27251197466 100644
--- 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' $< >$@