From: Jun Kuwamura <juk@rccm.co.jp>

  This patch fix the Makefiles in contrib/{pginterface, spi,
miscutil, int8, ip_and_mac, sequence, soundex, string, userlock,
array, datetime} to install their modules in one directory(lib/modules/).

Author: scrappy

contrib/array/Makefile

@@ -40,16 +40,16 @@ module:		$(MODULE)
 sql:		$(MODNAME).sql
 
 install:	$(MODULE)
-		cp -p $(MODULE) $(LIBDIR)
-		cd $(LIBDIR); strip $(MODULE)
+		cp -p $(MODULE) $(LIBDIR)/modules
+		cd $(LIBDIR)/modules; strip $(MODULE)
 
 %.sql: %.sql.in
-		sed "s|MODULE_PATHNAME|$(LIBDIR)/$(MODULE)|" < $< > $@
+		sed "s|MODULE_PATHNAME|$(LIBDIR)/modules/$(MODULE)|" < $< > $@
 
 .SUFFIXES: $(DLSUFFIX)
 
 %$(DLSUFFIX): %.c
-		cc $(CFLAGS) -shared -o $@ $<
+		$(CC) $(CFLAGS) -shared -o $@ $<
 
 depend dep:
 		$(CC) -MM $(INCLUDE_OPT) *.c >depend

contrib/array/array_iterator.c

@@ -71,7 +71,7 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
 
 	/* Lookup the function entry point */
 	proc_fn = (func_ptr) NULL;
-	fmgr_info(proc, &proc_fn, &pronargs);
+	fmgr_info(proc, &pronargs);	/* (proc, &proc_fn, &pronargs);	*/
 	if ((proc_fn == NULL) || (pronargs != 2))
 	{
 		elog(ERROR, "array_iterator: fmgr_info lookup failed for oid %d", proc);

contrib/array/array_iterator.sql

@@ -40,16 +40,16 @@ module:		$(MODULE)
 sql:		$(MODNAME).sql
 
 install:	$(MODULE)
-		cp -p $(MODULE) $(LIBDIR)
-		cd $(LIBDIR); strip $(MODULE)
+		cp -p $(MODULE) $(LIBDIR)/modules
+		cd $(LIBDIR)/modules; strip $(MODULE)
 
 %.sql: %.sql.in
-		sed "s|MODULE_PATHNAME|$(LIBDIR)/$(MODULE)|" < $< > $@
+		sed "s|MODULE_PATHNAME|$(LIBDIR)/modules/$(MODULE)|" < $< > $@
 
 .SUFFIXES: $(DLSUFFIX)
 
 %$(DLSUFFIX): %.c
-		cc $(CFLAGS) -shared -o $@ $<
+		$(CC) $(CFLAGS) -shared -o $@ $<
 
 depend dep:
 		$(CC) -MM $(INCLUDE_OPT) *.c >depend

contrib/datetime/Makefile

@@ -17,7 +17,7 @@
 #-------------------------------------------------------------------------
 
 ifndef PGDIR
-PGDIR= /opt/postgres/current
+PGDIR= ../..
 endif
 
 SRCDIR= $(PGDIR)/src
@@ -27,13 +27,13 @@ include $(SRCDIR)/Makefile.global
 # Comment out this re-declaration of LIBDIR
 #  if you are installing as the postgres superuser
 #   into a specific database or into template1.
-LIBDIR= /home/tgl/lib
+#LIBDIR= /home/tgl/lib
 
 CFLAGS+= -I$(PGDIR)/include -I$(PGDIR)/src/include -I$(LIBPQDIR)
 
 # This extra library is for the 64-bit division routine on my Linux box
 # and probably will need to be commented-out for most other platforms.
-CLIBS+= /usr/lib/gcc-lib/i486-linux/2.7.2/libgcc.a
+#CLIBS+= /usr/lib/gcc-lib/i486-linux/2.7.2/libgcc.a
 
 TARGETS= int8.sql int8$(DLSUFFIX)
 
@@ -44,7 +44,7 @@ int8$(DLSUFFIX):	int8.o
 
 install:
 	$(MAKE) all
-	cp -p int8$(DLSUFFIX) $(LIBDIR)
+	cp -p int8$(DLSUFFIX) $(LIBDIR)/modules
 
 %.sql: %.source
 	if [ -z "$$USER" ]; then USER=$$LOGNAME; fi; \
@@ -53,7 +53,7 @@ install:
 	rm -f $@; \
 	C=`pwd`; \
 	O=$C; \
-	if [ -d ${LIBDIR} ]; then O=${LIBDIR}; fi; \
+	if [ -d ${LIBDIR}/contrib ]; then O=${LIBDIR}/contrib; fi; \
 	sed -e "s:_CWD_:$$C:g" \
 	    -e "s:_OBJWD_:$$O:g" \
 	    -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \

contrib/datetime/datetime_functions.sql

@@ -1,25 +1,37 @@
 #
 #	PostgreSQL types for IP and MAC addresses
 #
-#	$Id: Makefile,v 1.2 1998/02/14 17:58:02 scrappy Exp $
+#	$Id: Makefile,v 1.3 1998/04/22 04:14:11 scrappy Exp $
 
-all: ip.so mac.so
+SRCDIR= ../../src
 
-ip.so: ip.o
-	ld -Bshareable -o ip.so ip.o
+include $(SRCDIR)/Makefile.global
 
-ip.o: ip.c
-	cc -g -O -fPIC -I/usr/local/pgsql/include -c ip.c
+CONTRIBDIR=$(LIBDIR)/modules
 
-mac.so: mac.o
-	ld -Bshareable -o mac.so mac.o
+CFLAGS+= $(CFLAGS_SL) -I$(SRCDIR)/include
 
-mac.o: mac.c mac.h
-	cc -g -O -fPIC -I/usr/local/pgsql/include -c mac.c
+ifdef REFINT_VERBOSE
+CFLAGS+= -DREFINT_VERBOSE
+endif
 
-install: ip.so mac.so
-	install -c ip.so mac.so /usr/local/pgsql/modules
+TARGETS= ip$(DLSUFFIX) ip.sql mac$(DLSUFFIX) mac.sql
 
-#
-#	eof
-#
+CLEANFILES+= $(TARGETS)
+
+all:: $(TARGETS)
+
+install:: all $(CONTRIBDIR)
+	for f in *$(DLSUFFIX); do $(INSTALL) -c $$f $(CONTRIBDIR)/$$f; done
+
+$(CONTRIBDIR):
+	mkdir -p $(CONTRIBDIR)
+
+%.sql: %.sql.in
+	rm -f $@; \
+	C=`pwd`; \
+	sed -e "s:_OBJWD_:$(CONTRIBDIR):g" \
+	    -e "s:_DLSUFFIX_:$(DLSUFFIX):g" < $< > $@
+
+clean: 
+	rm -f $(TARGETS) *.o