Changes made so new conversion Makefiles will build out of the source tree.

bmomjian · bmomjian · commit d46e3dc00f82 · 2002-08-21T21:33:55.000Z
diff --git a/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile
@@ -1,11 +1,12 @@
-#-------------------------------------------------------------------------
+]#-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/08/14 02:45:10 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/ascii_and_mic
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= ascii_and_mic
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/08/14 02:45:10 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/cyrillic_and_mic
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= cyrillic_and_mic
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/08/14 02:45:10 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/euc_cn_and_mic
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= euc_cn_and_mic
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/euc_jp_and_sjis
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= euc_jp_and_sjis
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/08/14 02:45:10 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/euc_kr_and_mic
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= euc_kr_and_mic
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile
@@ -1,8 +1,9 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/euc_tw_and_big5
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
@@ -11,4 +12,4 @@ NAME		:= euc_tw_and_big5
 SRCS += big5.c
 OBJS += big5.o
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/08/14 02:45:10 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/latin2_and_win1250
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= latin2_and_win1250
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/08/14 02:45:10 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/latin_and_mic
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= latin_and_mic
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/proc.mk b/src/backend/utils/mb/conversion_procs/proc.mk
@@ -16,6 +16,6 @@ uninstall: uninstall-lib
 clean distclean maintainer-clean: clean-lib
 	$(RM) $(OBJS)
 
-include $(top_builddir)/src/Makefile.shlib
+include $(top_srcdir)/src/Makefile.shlib
 
 all: $(shlib)
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_ascii
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_ascii
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_big5
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_big5
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/08/14 02:45:10 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_cyrillic
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_cyrillic
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_cn
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_euc_cn
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_jp
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_euc_jp
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_kr
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_euc_kr
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_tw
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_euc_tw
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_gb18030
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_gb18030
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_gbk
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_gbk
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_iso8859
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_iso8859
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_iso8859_1
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_johab
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_johab
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:06 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_sjis
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_sjis
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_tcvn/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_tcvn/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:06 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_tcvn
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_tcvn
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/07/16 09:25:06 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_uhc
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_uhc
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_win1250/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_win1250/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/08/14 02:45:10 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_win1250
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_win1250
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_win1256/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_win1256/Makefile
@@ -1,11 +1,12 @@
 #-------------------------------------------------------------------------
 #
-# $Id: Makefile,v 1.1 2002/08/14 02:45:10 ishii Exp $
+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $
 #
 #-------------------------------------------------------------------------
+subdir = src/backend/utils/mb/conversion_procs/utf8_and_win1256
 top_builddir = ../../../../../..
 include $(top_builddir)/src/Makefile.global
 
 NAME		:= utf8_and_win1256
 
-include ../proc.mk
+include $(srcdir)/../proc.mk
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_win874/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_win874/Makefile

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`		`-#-------------------------------------------------------------------------`
	`1`	`+]#-------------------------------------------------------------------------`
`2`	`2`	`#`
`3`		`-# $Id: Makefile,v 1.1 2002/08/14 02:45:10 ishii Exp $`
	`3`	`+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $`
`4`	`4`	`#`
`5`	`5`	`#-------------------------------------------------------------------------`
	`6`	`+subdir = src/backend/utils/mb/conversion_procs/ascii_and_mic`
`6`	`7`	`top_builddir = ../../../../../..`
`7`	`8`	`include $(top_builddir)/src/Makefile.global`
`8`	`9`
`9`	`10`	`NAME := ascii_and_mic`
`10`	`11`
`11`		`-include ../proc.mk`
	`12`	`+include $(srcdir)/../proc.mk`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`#-------------------------------------------------------------------------`
`2`	`2`	`#`
`3`		`-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $`
	`3`	`+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $`
`4`	`4`	`#`
`5`	`5`	`#-------------------------------------------------------------------------`
	`6`	`+subdir = src/backend/utils/mb/conversion_procs/euc_jp_and_sjis`
`6`	`7`	`top_builddir = ../../../../../..`
`7`	`8`	`include $(top_builddir)/src/Makefile.global`
`8`	`9`
`9`	`10`	`NAME := euc_jp_and_sjis`
`10`	`11`
`11`		`-include ../proc.mk`
	`12`	`+include $(srcdir)/../proc.mk`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`#-------------------------------------------------------------------------`
`2`	`2`	`#`
`3`		`-# $Id: Makefile,v 1.1 2002/07/16 09:25:05 ishii Exp $`
	`3`	`+# $Id: Makefile,v 1.2 2002/08/21 21:33:55 momjian Exp $`
`4`	`4`	`#`
`5`	`5`	`#-------------------------------------------------------------------------`
	`6`	`+subdir = src/backend/utils/mb/conversion_procs/euc_tw_and_big5`
`6`	`7`	`top_builddir = ../../../../../..`
`7`	`8`	`include $(top_builddir)/src/Makefile.global`
`8`	`9`
`@@ -11,4 +12,4 @@ NAME := euc_tw_and_big5`
`11`	`12`	`SRCS += big5.c`
`12`	`13`	`OBJS += big5.o`
`13`	`14`
`14`		`-include ../proc.mk`
	`15`	`+include $(srcdir)/../proc.mk`