Log Message:
-----------
Make slony bins obay --prefix when installing

Modified Files:
--------------
    slony1-engine:
        Makefile.global.in (r1.28 -> r1.29)
        configure (r1.48 -> r1.49)
        configure.ac (r1.47 -> r1.48)
    slony1-engine/src/slon:
        Makefile (r1.30 -> r1.31)
    slony1-engine/src/slonik:
        Makefile (r1.14 -> r1.15)

-------------- next part --------------
Index: Makefile.global.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.28 -r1.29
--- Makefile.global.in
+++ Makefile.global.in
@@ -18,6 +18,7 @@
 pgsharedir=		@PGSHAREDIR@
 pgbindir=		@PGBINDIR@
 toolsbin=		@TOOLSBIN@
+slonbindir=		@SLONBINDIR@
 distdir=		@SLONYPATH@/@PACKAGE_NAME at -@PACKAGE_VERSION@
 prefix=			@prefix@
 sysconfdir=		@sysconfdir@
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.47
retrieving revision 1.48
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.47 -r1.48
--- configure.ac
+++ configure.ac
@@ -160,6 +160,13 @@
 AC_SUBST(HOST_OS,$host_os)
 AC_SUBST(PORTNAME,$template)
 
+if test ${prefix} = "NONE"; then
+  SLONBINDIR="${PG_BINDIR}"
+else
+  SLONBINDIR="${prefix}/bin"
+fi
+AC_SUBST(SLONBINDIR,$SLONBINDIR)
+
 # ----
 # Tools for building docs
 # ---
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v
retrieving revision 1.48
retrieving revision 1.49
diff -Lconfigure -Lconfigure -u -w -r1.48 -r1.49
--- configure
+++ configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for postgresql-slony1-engine HEAD_20050530.
+# Generated by GNU Autoconf 2.53 for postgresql-slony1-engine HEAD_20050602.
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -254,8 +254,8 @@
 # Identity of this package.
 PACKAGE_NAME='postgresql-slony1-engine'
 PACKAGE_TARNAME='postgresql-slony1-engine'
-PACKAGE_VERSION='HEAD_20050530'
-PACKAGE_STRING='postgresql-slony1-engine HEAD_20050530'
+PACKAGE_VERSION='HEAD_20050602'
+PACKAGE_STRING='postgresql-slony1-engine HEAD_20050602'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src"
@@ -764,7 +764,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures postgresql-slony1-engine HEAD_20050530 to adapt to many kinds of systems.
+\`configure' configures postgresql-slony1-engine HEAD_20050602 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -825,7 +825,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050530:";;
+     short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050602:";;
    esac
   cat <<\_ACEOF
 
@@ -926,7 +926,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-postgresql-slony1-engine configure HEAD_20050530
+postgresql-slony1-engine configure HEAD_20050602
 generated by GNU Autoconf 2.53
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -941,7 +941,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by postgresql-slony1-engine $as_me HEAD_20050530, which was
+It was created by postgresql-slony1-engine $as_me HEAD_20050602, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   $ $0 $@
@@ -7984,6 +7984,14 @@
 PORTNAME=$template
 
 
+if test ${prefix} = "NONE"; then
+  SLONBINDIR="${PG_BINDIR}"
+else
+  SLONBINDIR="${prefix}/bin"
+fi
+SLONBINDIR=$SLONBINDIR
+
+
 # ----
 # Tools for building docs
 # ---
@@ -8811,7 +8819,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by postgresql-slony1-engine $as_me HEAD_20050530, which was
+This file was extended by postgresql-slony1-engine $as_me HEAD_20050602, which was
 generated by GNU Autoconf 2.53.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8870,7 +8878,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-postgresql-slony1-engine config.status HEAD_20050530
+postgresql-slony1-engine config.status HEAD_20050602
 configured by $0, generated by GNU Autoconf 2.53,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -9066,7 +9074,7 @@
 s, at LD@,$LD,;t t
 s, at YFLAGS@,$YFLAGS,;t t
 s, at LEXFLAGS@,$LEXFLAGS,;t t
-s, at HEAD_20050530@,$HEAD_20050530,;t t
+s, at HEAD_20050602@,$HEAD_20050602,;t t
 s, at with_gnu_ld@,$with_gnu_ld,;t t
 s, at acx_pthread_config@,$acx_pthread_config,;t t
 s, at PTHREAD_CC@,$PTHREAD_CC,;t t
@@ -9089,6 +9097,7 @@
 s, at SLONYPATH@,$SLONYPATH,;t t
 s, at HOST_OS@,$HOST_OS,;t t
 s, at PORTNAME@,$PORTNAME,;t t
+s, at SLONBINDIR@,$SLONBINDIR,;t t
 s, at GROFF@,$GROFF,;t t
 s, at PS2PDF@,$PS2PDF,;t t
 s, at DJPEG@,$DJPEG,;t t
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/Makefile,v
retrieving revision 1.30
retrieving revision 1.31
diff -Lsrc/slon/Makefile -Lsrc/slon/Makefile -u -w -r1.30 -r1.31
--- src/slon/Makefile
+++ src/slon/Makefile
@@ -85,11 +85,11 @@
 	rm -f conf-file.c
 
 install: all installdirs
-	$(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(pgbindir) 
+	$(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(slonbindir)
 
 
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(pgbindir)
+	$(mkinstalldirs) $(DESTDIR)$(slonbindir)
 
 
 
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slonik/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lsrc/slonik/Makefile -Lsrc/slonik/Makefile -u -w -r1.14 -r1.15
--- src/slonik/Makefile
+++ src/slonik/Makefile
@@ -67,11 +67,11 @@
 	rm -f parser.c scan.c y.tab.h
 
 install: all installdirs
-	$(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(pgbindir)
+	$(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(slonbindir)
 
 
 installdirs:
-	$(mkinstalldirs) $(DESTDIR)$(pgbindir)
+	$(mkinstalldirs) $(DESTDIR)$(slonbindir)
 
 
 distdir: $(DISTFILES)