summaryrefslogtreecommitdiff
blob: 20259695be710255ae34fe124921204555330685 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
=== contrib/Makefile
==================================================================
--- contrib/Makefile	(revision 10)
+++ contrib/Makefile	(local)
@@ -5,41 +5,8 @@
 include $(top_builddir)/src/Makefile.global
 
 WANTED_DIRS = \
-		btree_gist	\
-		chkpass		\
-		cube		\
-		dbase		\
-		dblink		\
-		dbmirror	\
-		dbsize		\
-		earthdistance	\
-		findoidjoins	\
-		fulltextindex	\
-		fuzzystrmatch	\
-		intagg		\
-		intarray	\
-		isbn_issn	\
-		lo		\
-		ltree		\
-		miscutil	\
-		mysql		\
-		noupdate	\
 		oid2name	\
-		pg_autovacuum	\
-		pg_dumplo	\
-		pg_trgm		\
 		pgbench		\
-		pgcrypto	\
-		pgstattuple	\
-		rtree_gist	\
-		seg		\
-		spi		\
-		string		\
-		tablefunc	\
-		tips		\
-		tsearch		\
-		tsearch2	\
-		userlock	\
 		vacuumlo
 
 # Missing:
=== src/Makefile
==================================================================
--- src/Makefile	(revision 10)
+++ src/Makefile	(local)
@@ -15,15 +15,11 @@
 
 all install installdirs uninstall dep depend distprep:
 	$(MAKE) -C port $@
-	$(MAKE) -C timezone $@
 	$(MAKE) -C backend $@
-	$(MAKE) -C backend/utils/mb/conversion_procs $@
 	$(MAKE) -C include $@
 	$(MAKE) -C interfaces $@
 	$(MAKE) -C bin $@
-	$(MAKE) -C pl $@
 	$(MAKE) -C makefiles $@
-	$(MAKE) -C utils $@
 
 install: install-local
 
=== src/backend/Makefile
==================================================================
--- src/backend/Makefile	(revision 10)
+++ src/backend/Makefile	(local)
@@ -34,7 +34,7 @@
 
 ##########################################################################
 
-all: submake-libpgport postgres $(POSTGRES_IMP)
+all: someheaders
 
 ifneq ($(PORTNAME), cygwin)
 ifneq ($(PORTNAME), win32)
@@ -104,8 +104,7 @@
 
 .PHONY: $(DIRS:%=%-recursive)
 # Update the commonly used headers before building the subdirectories
-$(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
-	$(MAKE) -C $(subst -recursive,,$@) all
+someheaders $(DIRS:%=%-recursive): $(top_builddir)/src/include/parser/parse.h $(top_builddir)/src/include/utils/fmgroids.h
 
 
 $(DLLINIT): $(DLLINIT:%.o=%.c)
@@ -151,22 +150,7 @@
 
 ##########################################################################
 
-install: all installdirs install-bin
-ifeq ($(PORTNAME), cygwin)
-ifeq ($(MAKE_DLL), true)
-	$(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a
-endif
-endif
-ifeq ($(PORTNAME), win32)
-ifeq ($(MAKE_DLL), true)
-	$(INSTALL_DATA) libpostgres.a $(DESTDIR)$(libdir)/libpostgres.a
-endif
-endif
-	$(MAKE) -C catalog install-data
-	$(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample $(DESTDIR)$(datadir)/pg_hba.conf.sample
-	$(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample $(DESTDIR)$(datadir)/pg_ident.conf.sample
-	$(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample $(DESTDIR)$(datadir)/postgresql.conf.sample
-	$(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample $(DESTDIR)$(datadir)/recovery.conf.sample
+install:
 
 install-bin: postgres $(POSTGRES_IMP) installdirs
 	$(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X)
=== src/bin/Makefile
==================================================================
--- src/bin/Makefile	(revision 10)
+++ src/bin/Makefile	(local)
@@ -13,8 +13,8 @@
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 
-DIRS := initdb ipcclean pg_ctl pg_dump \
-	psql scripts pg_config pg_controldata pg_resetxlog
+DIRS := pg_dump \
+	psql scripts pg_config
 ifeq ($(PORTNAME), win32)
 DIRS+=pgevent
 endif
=== src/include/pg_config_manual.h
==================================================================
--- src/include/pg_config_manual.h	(revision 10)
+++ src/include/pg_config_manual.h	(local)
@@ -160,7 +160,7 @@
  * here's where to twiddle it.  You can also override this at runtime
  * with the postmaster's -k switch.
  */
-#define DEFAULT_PGSOCKET_DIR  "/tmp"
+#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
 
 /*
  * The random() function is expected to yield values between 0 and