Fix contrib/rserv to install successfully when built outside source tree.

(Not that it will actually work with 7.3, I fear.)

diff --git a/contrib/contrib-global.mk b/contrib/contrib-global.mk
index 61025aad428f0a4a8180f19a16353145c9f620db..7bbba032bcb83d573c57221b479974927ba95348 100644 (file)
--- a/contrib/contrib-global.mk
+++ b/contrib/contrib-global.mk
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/contrib/contrib-global.mk,v 1.3 2002/09/05 18:28:45 petere Exp $
+# $Header: /cvsroot/pgsql/contrib/contrib-global.mk,v 1.4 2002/11/01 23:45:37 tgl Exp $
 
 # This file contains generic rules to build many kinds of simple
 # contrib modules.  You only need to set a few variables and include
@@ -24,6 +24,8 @@
 #     which need to be built first
 #   DOCS -- random files to install under $PREFIX/doc/contrib
 #   SCRIPTS -- script files (not binaries) to install into $PREFIX/bin
+#   SCRIPTS_built -- script files (not binaries) to install into $PREFIX/bin,
+#     which need to be built first
 #   REGRESS -- list of regression test cases (without suffix)
 #
 # or at most one of these two:
@@ -52,7 +54,7 @@ ifdef PG_CPPFLAGS
 override CPPFLAGS := $(PG_CPPFLAGS) $(CPPFLAGS)
 endif
 
-all: $(PROGRAM) $(DATA_built) $(addsuffix $(DLSUFFIX), $(MODULES))
+all: $(PROGRAM) $(DATA_built) $(SCRIPTS_built) $(addsuffix $(DLSUFFIX), $(MODULES))
 
 ifdef MODULE_big
 # shared library parameters
@@ -100,6 +102,12 @@ ifdef SCRIPTS
          $(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir); \
        done
 endif # SCRIPTS
+ifdef SCRIPTS_built
+       @for file in $(SCRIPTS_built); do \
+         echo "$(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir)"; \
+         $(INSTALL_SCRIPT) $$file $(DESTDIR)$(bindir); \
+       done
+endif # SCRIPTS_built
 
 
 installdirs:
@@ -112,7 +120,7 @@ endif
 ifdef DOCS
        $(mkinstalldirs) $(DESTDIR)$(docdir)/contrib
 endif
-ifneq (,$(PROGRAM)$(SCRIPTS))
+ifneq (,$(PROGRAM)$(SCRIPTS)$(SCRIPTS_built))
        $(mkinstalldirs) $(DESTDIR)$(bindir)
 endif
 
@@ -136,6 +144,9 @@ endif
 ifdef SCRIPTS
        rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS))
 endif
+ifdef SCRIPTS_built
+       rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS_built))
+endif
 
 
 clean:
@@ -145,6 +156,9 @@ endif
 ifdef DATA_built
        rm -f $(DATA_built)
 endif
+ifdef SCRIPTS_built
+       rm -f $(SCRIPTS_built)
+endif
 ifdef PROGRAM
        rm -f $(PROGRAM)$(X)
 endif

diff --git a/contrib/rserv/Makefile b/contrib/rserv/Makefile
index f6b202db5052612c95a53049c2cb58472f562466..75bbf221dfbced2289a7a6b43f9d57abc9623208 100644 (file)
--- a/contrib/rserv/Makefile
+++ b/contrib/rserv/Makefile
@@ -11,24 +11,17 @@ DATA        = RServ.pm
 DATA_built     = master.sql slave.sql
 SQLS   = $(DATA_built)
 DOCS   = README.rserv
-SCRIPTS        = RservTest
-SCRIPTS        += MasterInit MasterAddTable Replicate MasterSync CleanLog
-SCRIPTS        += SlaveInit SlaveAddTable GetSyncID
-SCRIPTS        += PrepareSnapshot ApplySnapshot
-SCRIPTS        += InitRservTest
-EXTRA_CLEAN    = $(SCRIPTS)
+SCRIPTS_built  = RservTest
+SCRIPTS_built  += MasterInit MasterAddTable Replicate MasterSync CleanLog
+SCRIPTS_built  += SlaveInit SlaveAddTable GetSyncID
+SCRIPTS_built  += PrepareSnapshot ApplySnapshot
+SCRIPTS_built  += InitRservTest
 
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
-override CFLAGS += $(CFLAGS_SL)
-SHLIB_LINK = $(BE_DLLLIBS)
-
-
-all: $(SCRIPTS) $(SQLS) $(addsuffix $(DLSUFFIX), $(MODULES))
 
 $(SQLS): %.sql: %.sql.in
        sed 's,@MODULE_FILENAME@,$$libdir/$(NAME),g' $< >$@
 
-$(SCRIPTS): %: %.in
+$(SCRIPTS_built): %: %.in
        sed -e 's,@MODULE_FILENAME@,$$libdir/$(NAME),g' \
            -e 's:@SQLDIR@:$(datadir)/contrib:g' \
            -e 's:@BINDIR@:$(bindir):g' \