CVS User Account cvsuser
Wed Aug 18 23:39:58 PDT 2004
Log Message:
-----------
Make AXI compile again

Modified Files:
--------------
    slony1-engine/src/backend:
        Makefile (r1.14 -> r1.15)
    slony1-engine/src/xxid:
        Makefile (r1.12 -> r1.13)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/backend/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -Lsrc/backend/Makefile -Lsrc/backend/Makefile -u -w -r1.14 -r1.15
--- src/backend/Makefile
+++ src/backend/Makefile
@@ -19,13 +19,17 @@
 
 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)		\
@@ -42,7 +46,7 @@
 
 all:	$(ALL)
 
-$(SO_NAME):	$(SO_OBJS)
+$(SO_NAME):	$(SO_OBJS) $(POSTGRES_IMP)
 
 clean distclean maintainer-clean:
 	rm -f $(SO_NAME) $(SO_OBJS)
@@ -67,3 +71,7 @@
       cp $$file $(distdir)/$(subdir)/$$file ; \
     done
 
+ifeq ($(PORTNAME), aix)
+$(POSTGRES_IMP): $(pgbindir)/postgres
+	$(MKLDEXPORT) $(pgbindir)/postgres > $@
+endif
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/xxid/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -Lsrc/xxid/Makefile -Lsrc/xxid/Makefile -u -w -r1.12 -r1.13
--- src/xxid/Makefile
+++ src/xxid/Makefile
@@ -17,9 +17,13 @@
 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
+
 ALL =					\
 	$(SO_NAME)			\
 	$(SQL_NAMES)		\
@@ -31,7 +35,7 @@
 $(SQL_NAME74):	$(SQL_NAME73)
 	cp $< $@
 
-$(SO_NAME):     $(SO_OBJS)
+$(SO_NAME):     $(SO_OBJS) $(POSTGRES_IMP)
 
 clean distclean maintainer-clean:
 	rm -f $(SO_NAME) $(SO_OBJS)
@@ -56,3 +60,7 @@
       cp $$file $(distdir)/$(subdir)/$$file ; \
     done
 
+ifeq ($(PORTNAME), aix)
+$(POSTGRES_IMP): $(pgbindir)/postgres
+	$(MKLDEXPORT) $(pgbindir)/postgres > $@
+endif


More information about the Slony1-commit mailing list