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/).

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

@@ -1,137 +0,0 @@
-/*
- * SQL code
-
-- - -- load the new functions
-- - --
-load '/home/dz/lib/postgres/array_iterator.so';
-
-- - -- define the array operators *=, **=, *~ and **~ for type _text
-- - --
-create function array_texteq(_text, text)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create function array_all_texteq(_text, text)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create function array_textregexeq(_text, text)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create function array_all_textregexeq(_text, text)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create operator *= (
-  leftarg=_text, 
-  rightarg=text, 
-  procedure=array_texteq);
-
-create operator **= (
-  leftarg=_text,
-  rightarg=text,
-  procedure=array_all_texteq);
-
-create operator *~ (
-  leftarg=_text,
-  rightarg=text,
-  procedure=array_textregexeq);
-
-create operator **~ (
-  leftarg=_text,
-  rightarg=text,
-  procedure=array_all_textregexeq);
-
-- - -- define the array operators *=, **=, *~ and **~ for type _char16
-- - --
-create function array_char16eq(_char16, char16)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create function array_all_char16eq(_char16, char16)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create function array_char16regexeq(_char16, text)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create function array_all_char16regexeq(_char16, text)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create operator *= (
-  leftarg=_char16,
-  rightarg=char16,
-  procedure=array_char16eq);
-
-create operator **= (
-  leftarg=_char16,
-  rightarg=char16,
-  procedure=array_all_char16eq);
-
-create operator *~ (
-  leftarg=_char16,
-  rightarg=text,
-  procedure=array_char16regexeq);
-
-create operator **~ (
-  leftarg=_char16,
-  rightarg=text,
-  procedure=array_all_char16regexeq);
-
-- - -- define the array operators *=, **=, *> and **> for type _int4
-- - --
-create function array_int4eq(_int4, int4)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create function array_all_int4eq(_int4, int4)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create function array_int4gt(_int4, int4)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create function array_all_int4gt(_int4, int4)
-  returns bool
-  as '/home/dz/lib/postgres/array_iterator.so' 
-  language 'c';
-
-create operator *= (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_int4eq);
-
-create operator **= (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_all_int4eq);
-
-create operator *> (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_int4gt);
-
-create operator **> (
-  leftarg=_int4,
-  rightarg=int4,
-  procedure=array_all_int4gt);
-
-*/
-
-/* end of file */
-