Log Message:
-----------
Make the AIX build a bit cleaner

Modified Files:
--------------
    slony1-engine/makefiles:
        Makefile.aix (r1.5 -> r1.6)
    slony1-engine/src/backend:
        Makefile (r1.15 -> r1.16)
    slony1-engine/src/xxid:
        Makefile (r1.13 -> r1.14)

-------------- next part --------------
Index: Makefile.aix
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/makefiles/Makefile.aix,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lmakefiles/Makefile.aix -Lmakefiles/Makefile.aix -u -w -r1.5 -r1.6
--- makefiles/Makefile.aix
+++ makefiles/Makefile.aix
@@ -19,7 +19,7 @@
 EXPSUFF= .exp
 IMPSUFF= .imp
 
-POSTGRES_IMP= postgres$(IMPSUFF)
+POSTGRES_IMP= $(slony_top_builddir)/postgres$(IMPSUFF)
 
 MKLDEXPORT=$(slony_top_builddir)/makefiles/mkldexport.sh
 
@@ -31,4 +31,4 @@
 
 %$(DLSUFFIX): %.o %$(EXPSUFF)
 	@echo Making shared library $@ from $*.o, $*$(EXPSUFF) and postgres.imp
-	$(CC) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bI:$(slony_top_builddir)/src/backend/$(POSTGRES_IMP) -Wl,-bE:$*$(EXPSUFF) $(LIBS)
+	$(CC) $(LDFLAGS) $(LDFLAGS_SL) -o $@ $*.o -Wl,-bI:$(POSTGRES_IMP) -Wl,-bE:$*$(EXPSUFF) $(LIBS)
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/backend/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -Lsrc/backend/Makefile -Lsrc/backend/Makefile -u -w -r1.15 -r1.16
--- src/backend/Makefile
+++ src/backend/Makefile
@@ -19,17 +19,12 @@
 
 BASE_COMMON		= slony1_base.sql
 FUNCS_COMMON	= slony1_funcs.sql
-POSTGRES_IMP=
 BASE_73			= slony1_base.v73.sql
 FUNCS_73		= slony1_funcs.v73.sql
 
 BASE_74			= slony1_base.v74.sql
 FUNCS_74		= slony1_funcs.v74.sql
 
-ifeq ($(PORTNAME), aix)
-POSTGRES_IMP=$(slony_top_builddir)/postgresql.imp
-endif
-
 SQL_NAMES =				\
 	$(BASE_COMMON)		\
 	$(FUNCS_COMMON)		\
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/xxid/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -Lsrc/xxid/Makefile -Lsrc/xxid/Makefile -u -w -r1.13 -r1.14
--- src/xxid/Makefile
+++ src/xxid/Makefile
@@ -17,12 +17,8 @@
 SQL_NAME73	= $(NAME).v73.sql
 SQL_NAME74	= $(NAME).v74.sql
 SQL_NAMES	= $(SQL_NAME73) $(SQL_NAME74)
-POSTGRES_IMP=
-SO_OBJS		= xxid.o
 
-ifeq ($(PORTNAME), aix)
-POSTGRES_IMP=$(slony_top_builddir)/postgresql.imp
-endif
+SO_OBJS		= xxid.o
 
 ALL =					\
 	$(SO_NAME)			\