]> git.pld-linux.org Git - packages/postgresql.git/blame - postgresql-DESTDIR.patch
projects / packages / postgresql.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- pgaccess icon and desktop file.
[packages/postgresql.git] / postgresql-DESTDIR.patch
CommitLineData
563217a7 1diff -Nru postgresql-7.0.2/doc/Makefile postgresql-7.0.2.new/doc/Makefile
2--- postgresql-7.0.2/doc/Makefile Mon Jul 24 10:56:31 2000
3+++ postgresql-7.0.2.new/doc/Makefile Sat Jul 22 06:29:39 2000
4@@ -57,8 +57,8 @@
5 $(MAKE) clean
6
7 man::
8- -@if test ! -d $(POSTMANDIR) ; then mkdir $(POSTMANDIR) ; fi
9- $(GZCAT) man.tar.gz | (cd $(POSTMANDIR) ; $(TAR) xf - )
10+ mkdir -p $(DESTDIR)$(POSTMANDIR)
11+ $(GZCAT) man.tar.gz | (cd $(DESTDIR)$(POSTMANDIR) ; $(TAR) xf - )
12
13 #
14 # Generic production rules
15@@ -73,7 +73,6 @@
16 # to replace symlinks - thomas 1998-03-01
17
18 %: %.tar.gz
19- rm -rf ./$@ $(PGDOCS)/$*
20- if test ! -d $(PGDOCS)/$* ; then mkdir $(PGDOCS)/$* ; fi
21- $(GZCAT) $< | (cd $(PGDOCS)/$* ; $(TAR) xf - )
22+ mkdir -p $(DESTDIR)$(PGDOCS)/$*
23+ $(GZCAT) $< | (cd $(DESTDIR)$(PGDOCS)/$* ; $(TAR) xf - )
24 # touch ./$*
25diff -Nru postgresql-7.0.2/src/Makefile.global.in postgresql-7.0.2.new/src/Makefile.global.in
26--- postgresql-7.0.2/src/Makefile.global.in Mon Jul 24 10:56:31 2000
27+++ postgresql-7.0.2.new/src/Makefile.global.in Mon Jul 24 11:01:33 2000
28@@ -66,13 +66,14 @@
bd2eb624
AF		 29
30 # Where the postgres executables live (changeable by just putting them
31 # somewhere else and putting that directory in your shell PATH)
563217a7 32-BINDIR= $(POSTGRESDIR)/bin
33+BINDIR= @bindir@
34
35 # Where libpq.a gets installed. You must put it where your loader will
36 # look for it if you wish to use the -lpq convention. Otherwise you
37 # can just put the absolute pathname to the library at the end of your
38 # command line.
39-LIBDIR= $(POSTGRESDIR)/lib
40+LIBDIR= @libdir@
41+sysconfdir= @sysconfdir@
42
43 # Where the database templates are stored
44 #
45@@ -84,13 +85,13 @@
74fda536 46 IPCRM=@ipcrm@
bd2eb624
AF		 47
48 # Where the man pages (suitable for use with "man") get installed.
49-POSTMANDIR= $(POSTGRESDIR)/man
563217a7 50+POSTMANDIR= @mandir@
bd2eb624
AF		 51
52 # Where the formatted documents (e.g., the reference manual) get installed.
563217a7 53 POSTDOCDIR= $(POSTGRESDIR)/doc
54
55 # Where the header files necessary to build frontend programs get installed.
56-HEADERDIR= $(POSTGRESDIR)/include
57+HEADERDIR= @includedir@/pgsql
58
59 # Where the ODBC installation-wide configuration file gets installed.
60 # This needs to be a client-side readable area, so can't go in $PGDATA.
61diff -Nru postgresql-7.0.2/src/Makefile.shlib postgresql-7.0.2.new/src/Makefile.shlib
62--- postgresql-7.0.2/src/Makefile.shlib Mon Jul 24 10:56:31 2000
63+++ postgresql-7.0.2.new/src/Makefile.shlib Thu Jul 6 10:01:02 2000
64@@ -269,18 +269,20 @@
65 .PHONY: all install-lib install-shlib
66
67 install-lib: lib$(NAME).a
68- $(INSTALL) $(INSTL_LIB_OPTS) lib$(NAME).a $(LIBDIR)/lib$(NAME).a
69+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)
70+ $(INSTALL) $(INSTL_LIB_OPTS) lib$(NAME).a $(DESTDIR)$(LIBDIR)/lib$(NAME).a
71
72 install-shlib: $(shlib)
73- $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(LIBDIR)/$(shlib)
74+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)
75+ $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)
76 ifneq ($(PORTNAME), win)
77 if [ "$(shlib)" != "lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)" ]; then \
78- cd $(LIBDIR); \
79+ cd $(DESTDIR)$(LIBDIR); \
80 rm -f lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION); \
81 $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION); \
82 fi
83 if [ "$(shlib)" != "lib$(NAME)$(DLSUFFIX)" ]; then \
84- cd $(LIBDIR); \
85+ cd $(DESTDIR)$(LIBDIR); \
86 rm -f lib$(NAME)$(DLSUFFIX); \
87 $(LN_S) $(shlib) lib$(NAME)$(DLSUFFIX); \
88 fi
89diff -Nru postgresql-7.0.2/src/backend/Makefile postgresql-7.0.2.new/src/backend/Makefile
90--- postgresql-7.0.2/src/backend/Makefile Mon Jul 24 10:56:31 2000
91+++ postgresql-7.0.2.new/src/backend/Makefile Sat Jul 22 07:13:08 2000
92@@ -167,118 +167,91 @@
93
94 .PHONY: install install-bin install-templates install-headers
95
96-install: $(LIBDIR) $(BINDIR) $(HEADERDIR) $(TEMPLATEDIR) \
97- postgres $(POSTGRES_IMP) \
98+install: postgres $(POSTGRES_IMP) \
99 install-bin install-templates install-headers
100
101 install-bin: $(BINDIR) postgres$(X) $(POSTGRES_IMP)
102- $(INSTALL) $(INSTL_EXE_OPTS) postgres$(X) $(BINDIR)/postgres$(X)
103- @rm -f $(BINDIR)/postmaster
104- ln -s postgres$(X) $(BINDIR)/postmaster
105+ $(INSTALL) -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR)
106+ $(INSTALL) $(INSTL_EXE_OPTS) postgres$(X) $(DESTDIR)$(BINDIR)/postgres$(X)
107+ ln -s postgres$(X) $(DESTDIR)$(BINDIR)/postmaster
108 ifeq ($(MAKE_EXPORTS), true)
109- $(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(LIBDIR)/$(POSTGRES_IMP)
110+ $(INSTALL) $(INSTLOPTS) $(POSTGRES_IMP) $(DESTDIR)$(LIBDIR)/$(POSTGRES_IMP)
111 endif
112 ifeq ($(PORTNAME), win)
113 ifeq ($(MAKE_DLL), true)
114-# $(INSTALL) $(INSTLOPTS) postgres.dll $(BINDIR)/postgres.dll
115- $(INSTALL) $(INSTLOPTS) libpostgres.a $(LIBDIR)/libpostgres.a
116+# $(INSTALL) $(INSTLOPTS) postgres.dll $(DESTDIR)$(BINDIR)/postgres.dll
117+ $(INSTALL) $(INSTLOPTS) libpostgres.a $(DESTDIR)$(LIBDIR)/libpostgres.a
118 endif
119 endif
120
121-install-templates: $(TEMPLATEDIR) \
122+install-templates: \
123 global1.bki.source local1_template1.bki.source \
124 global1.description local1_template1.description \
125 libpq/pg_hba.conf.sample libpq/pg_ident.conf.sample \
126 optimizer/geqo/pg_geqo.sample \
127 pg_options.sample
128+ $(INSTALL) -d $(DESTDIR)$(TEMPLATEDIR)
129 $(INSTALL) $(INSTLOPTS) global1.bki.source \
130- $(TEMPLATEDIR)/global1.bki.source
131+ $(DESTDIR)$(TEMPLATEDIR)/global1.bki.source
132 $(INSTALL) $(INSTLOPTS) global1.description \
133- $(TEMPLATEDIR)/global1.description
134+ $(DESTDIR)$(TEMPLATEDIR)/global1.description
135 $(INSTALL) $(INSTLOPTS) local1_template1.bki.source \
136- $(TEMPLATEDIR)/local1_template1.bki.source
137+ $(DESTDIR)$(TEMPLATEDIR)/local1_template1.bki.source
138 $(INSTALL) $(INSTLOPTS) local1_template1.description \
139- $(TEMPLATEDIR)/local1_template1.description
140+ $(DESTDIR)$(TEMPLATEDIR)/local1_template1.description
141 $(INSTALL) $(INSTLOPTS) libpq/pg_hba.conf.sample \
142- $(TEMPLATEDIR)/pg_hba.conf.sample
143+ $(DESTDIR)$(TEMPLATEDIR)/pg_hba.conf.sample
144 $(INSTALL) $(INSTLOPTS) libpq/pg_ident.conf.sample \
145- $(TEMPLATEDIR)/pg_ident.conf.sample
146+ $(DESTDIR)$(TEMPLATEDIR)/pg_ident.conf.sample
147 $(INSTALL) $(INSTLOPTS) optimizer/geqo/pg_geqo.sample \
148- $(TEMPLATEDIR)/pg_geqo.sample
149+ $(DESTDIR)$(TEMPLATEDIR)/pg_geqo.sample
150 $(INSTALL) $(INSTLOPTS) pg_options.sample \
151- $(TEMPLATEDIR)/pg_options.sample
152+ $(DESTDIR)$(TEMPLATEDIR)/pg_options.sample
153
154 install-headers: fmgr.h $(SRCDIR)/include/config.h
155- -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
156- -@if [ ! -d $(HEADERDIR)/port ]; then mkdir $(HEADERDIR)/port; fi
157- -@if [ ! -d $(HEADERDIR)/port/$(PORTNAME) ]; \
158- then mkdir $(HEADERDIR)/port/$(PORTNAME); fi
159- -@if [ ! -d $(HEADERDIR)/lib ]; \
160- then mkdir $(HEADERDIR)/lib; fi
161- -@if [ ! -d $(HEADERDIR)/libpq ]; \
162- then mkdir $(HEADERDIR)/libpq; fi
163- -@if [ ! -d $(HEADERDIR)/utils ]; \
164- then mkdir $(HEADERDIR)/utils; fi
165- -@if [ ! -d $(HEADERDIR)/access ]; \
166- then mkdir $(HEADERDIR)/access; fi
167- -@if [ ! -d $(HEADERDIR)/executor ]; \
168- then mkdir $(HEADERDIR)/executor; fi
169- -@if [ ! -d $(HEADERDIR)/commands ]; \
170- then mkdir $(HEADERDIR)/commands; fi
171+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/port/$(PORTNAME)
172+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/lib
173+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/libpq
174+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/utils
175+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/access
176+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/executor
177+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/commands
178 $(INSTALL) $(INSTLOPTS) fmgr.h \
179- $(HEADERDIR)/fmgr.h
180+ $(DESTDIR)$(HEADERDIR)/fmgr.h
181 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/os.h \
182- $(HEADERDIR)/os.h
183+ $(DESTDIR)$(HEADERDIR)/os.h
184 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/config.h \
185- $(HEADERDIR)/config.h
186+ $(DESTDIR)$(HEADERDIR)/config.h
187 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/c.h \
188- $(HEADERDIR)/c.h
189+ $(DESTDIR)$(HEADERDIR)/c.h
190 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres.h \
191- $(HEADERDIR)/postgres.h
192+ $(DESTDIR)$(HEADERDIR)/postgres.h
193 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/postgres_ext.h \
194- $(HEADERDIR)/postgres_ext.h
195+ $(DESTDIR)$(HEADERDIR)/postgres_ext.h
196 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/pqcomm.h \
197- $(HEADERDIR)/libpq/pqcomm.h
198+ $(DESTDIR)$(HEADERDIR)/libpq/pqcomm.h
199 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/libpq/libpq-fs.h \
200- $(HEADERDIR)/libpq/libpq-fs.h
201+ $(DESTDIR)$(HEADERDIR)/libpq/libpq-fs.h
202 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/lib/dllist.h \
203- $(HEADERDIR)/lib/dllist.h
204+ $(DESTDIR)$(HEADERDIR)/lib/dllist.h
205 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/geo_decls.h \
206- $(HEADERDIR)/utils/geo_decls.h
207+ $(DESTDIR)$(HEADERDIR)/utils/geo_decls.h
208 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/elog.h \
209- $(HEADERDIR)/utils/elog.h
210+ $(DESTDIR)$(HEADERDIR)/utils/elog.h
211 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/palloc.h \
212- $(HEADERDIR)/utils/palloc.h
213+ $(DESTDIR)$(HEADERDIR)/utils/palloc.h
214 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/utils/mcxt.h \
215- $(HEADERDIR)/utils/mcxt.h
216+ $(DESTDIR)$(HEADERDIR)/utils/mcxt.h
217 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/access/attnum.h \
218- $(HEADERDIR)/access/attnum.h
219+ $(DESTDIR)$(HEADERDIR)/access/attnum.h
220 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/executor/spi.h \
221- $(HEADERDIR)/executor/spi.h
222+ $(DESTDIR)$(HEADERDIR)/executor/spi.h
223 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/include/commands/trigger.h \
224- $(HEADERDIR)/commands/trigger.h
225+ $(DESTDIR)$(HEADERDIR)/commands/trigger.h
226 ifeq ($(PORTNAME), hpux)
227 # is this still necessary?
228 $(INSTALL) $(INSTLOPTS) $(SRCDIR)/backend/port/hpux/fixade.h \
229- $(HEADERDIR)/port/hpux/fixade.h
230-endif
231-
232-$(BINDIR):
233- mkdir $@
234-
235-$(LIBDIR):
236- mkdir $@
237-
238-$(HEADERDIR):
239- mkdir $@
240-
241-# TEMPLATEDIR is commonly the same as LIBDIR, but it might be different.
242-# We don't want duplicate rules if they are the same.
243-ifneq ($(TEMPLATEDIR),$(LIBDIR))
244-
245-$(TEMPLATEDIR):
246- mkdir $@
247-
248+ $(DESTDIR)$(HEADERDIR)/port/hpux/fixade.h
249 endif
250
251
252diff -Nru postgresql-7.0.2/src/bin/initdb/Makefile postgresql-7.0.2.new/src/bin/initdb/Makefile
253--- postgresql-7.0.2/src/bin/initdb/Makefile Mon Jul 24 10:56:31 2000
254+++ postgresql-7.0.2.new/src/bin/initdb/Makefile Thu Jul 6 10:01:02 2000
255@@ -20,7 +20,8 @@
256 sed -e 's/__MULTIBYTE__/$(MULTIBYTE)/g' < initdb.sh > initdb
257
258 install: initdb
259- $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)/$+
260+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
261+ $(INSTALL) $(INSTL_EXE_OPTS) $+ $(DESTDIR)$(BINDIR)/$+
262
263 clean:
264 rm -f initdb
265diff -Nru postgresql-7.0.2/src/bin/initlocation/Makefile postgresql-7.0.2.new/src/bin/initlocation/Makefile
266--- postgresql-7.0.2/src/bin/initlocation/Makefile Mon Jul 24 10:56:31 2000
267+++ postgresql-7.0.2.new/src/bin/initlocation/Makefile Thu Jul 6 10:01:02 2000
268@@ -20,7 +20,8 @@
269 cp -p initlocation.sh initlocation
270
271 install: initlocation
272- $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
273+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
274+ $(INSTALL) $(INSTL_EXE_OPTS) $+ $(DESTDIR)$(BINDIR)
275
276 clean:
277 rm -f initlocation
278diff -Nru postgresql-7.0.2/src/bin/ipcclean/Makefile postgresql-7.0.2.new/src/bin/ipcclean/Makefile
279--- postgresql-7.0.2/src/bin/ipcclean/Makefile Mon Jul 24 10:56:31 2000
280+++ postgresql-7.0.2.new/src/bin/ipcclean/Makefile Thu Jul 6 10:01:02 2000
281@@ -19,7 +19,8 @@
282 cp $< $@
283
284 install: ipcclean
285- $(INSTALL) $(INSTL_EXE_OPTS) $^ $(BINDIR)
286+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
287+ $(INSTALL) $(INSTL_EXE_OPTS) $^ $(DESTDIR)$(BINDIR)
288
289 clean:
290 rm -f ipcclean
291diff -Nru postgresql-7.0.2/src/bin/pg_ctl/Makefile postgresql-7.0.2.new/src/bin/pg_ctl/Makefile
292--- postgresql-7.0.2/src/bin/pg_ctl/Makefile Mon Jul 24 10:56:31 2000
293+++ postgresql-7.0.2.new/src/bin/pg_ctl/Makefile Thu Jul 6 10:01:02 2000
294@@ -20,8 +20,10 @@
295 cat pg_ctl.sh > pg_ctl
296
297 install: pg_ctl
298- $(INSTALL) $(INSTL_EXE_OPTS) $+ $(BINDIR)
299- $(INSTALL) $(INSTLOPTS) postmaster.opts.default.sample $(TEMPLATEDIR)
300+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
301+ $(INSTALL) -d $(DESTDIR)$(TEMPLATEDIR)
302+ $(INSTALL) $(INSTL_EXE_OPTS) $+ $(DESTDIR)$(BINDIR)
303+ $(INSTALL) $(INSTLOPTS) postmaster.opts.default.sample $(DESTDIR)$(TEMPLATEDIR)
304
305 clean:
306 rm -f pg_ctl
307diff -Nru postgresql-7.0.2/src/bin/pg_dump/Makefile.in postgresql-7.0.2.new/src/bin/pg_dump/Makefile.in
308--- postgresql-7.0.2/src/bin/pg_dump/Makefile.in Mon Jul 24 10:56:31 2000
309+++ postgresql-7.0.2.new/src/bin/pg_dump/Makefile.in Thu Jul 6 10:01:02 2000
310@@ -39,9 +39,10 @@
311 $(MAKE) -C $(LIBPQDIR) libpq.a
312
313 install: pg_dump
314- $(INSTALL) $(INSTL_EXE_OPTS) pg_dump$(X) $(BINDIR)/pg_dump$(X)
315- $(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(BINDIR)/pg_dumpall
316- $(INSTALL) $(INSTL_EXE_OPTS) pg_upgrade $(BINDIR)/pg_upgrade
317+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
318+ $(INSTALL) $(INSTL_EXE_OPTS) pg_dump$(X) $(DESTDIR)$(BINDIR)/pg_dump$(X)
319+ $(INSTALL) $(INSTL_EXE_OPTS) pg_dumpall $(DESTDIR)$(BINDIR)/pg_dumpall
320+ $(INSTALL) $(INSTL_EXE_OPTS) pg_upgrade $(DESTDIR)$(BINDIR)/pg_upgrade
321
322 depend dep:
323 $(CC) -MM $(CFLAGS) *.c >depend
324diff -Nru postgresql-7.0.2/src/bin/pg_encoding/Makefile postgresql-7.0.2.new/src/bin/pg_encoding/Makefile
325--- postgresql-7.0.2/src/bin/pg_encoding/Makefile Mon Jul 24 10:56:31 2000
326+++ postgresql-7.0.2.new/src/bin/pg_encoding/Makefile Thu Jul 6 10:01:02 2000
327@@ -30,7 +30,8 @@
328 $(MAKE) -C $(LIBPQDIR) libpq.a
329
330 install: pg_encoding
331- $(INSTALL) $(INSTL_EXE_OPTS) pg_encoding$(X) $(BINDIR)/pg_encoding$(X)
332+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
333+ $(INSTALL) $(INSTL_EXE_OPTS) pg_encoding$(X) $(DESTDIR)$(BINDIR)/pg_encoding$(X)
334
335 depend dep:
336 $(CC) -MM $(CFLAGS) *.c >depend
337diff -Nru postgresql-7.0.2/src/bin/pg_id/Makefile postgresql-7.0.2.new/src/bin/pg_id/Makefile
338--- postgresql-7.0.2/src/bin/pg_id/Makefile Mon Jul 24 10:56:31 2000
339+++ postgresql-7.0.2.new/src/bin/pg_id/Makefile Thu Jul 6 10:01:02 2000
340@@ -20,7 +20,8 @@
341 $(CC) -o pg_id $(OBJS) $(LDFLAGS)
342
343 install: pg_id
344- $(INSTALL) $(INSTL_EXE_OPTS) pg_id$(X) $(BINDIR)/pg_id$(X)
345+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
346+ $(INSTALL) $(INSTL_EXE_OPTS) pg_id$(X) $(DESTDIR)$(BINDIR)/pg_id$(X)
347
348 depend dep:
349 $(CC) -MM $(CFLAGS) *.c >depend
350diff -Nru postgresql-7.0.2/src/bin/pg_passwd/Makefile postgresql-7.0.2.new/src/bin/pg_passwd/Makefile
351--- postgresql-7.0.2/src/bin/pg_passwd/Makefile Mon Jul 24 10:56:31 2000
352+++ postgresql-7.0.2.new/src/bin/pg_passwd/Makefile Thu Jul 6 10:01:02 2000
353@@ -15,7 +15,8 @@
354 $(CC) $(CFLAGS) -o pg_passwd $(OBJS) $(LDFLAGS)
355
356 install: pg_passwd
357- $(INSTALL) $(INSTL_EXE_OPTS) pg_passwd$(X) $(BINDIR)/pg_passwd$(X)
358+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
359+ $(INSTALL) $(INSTL_EXE_OPTS) pg_passwd$(X) $(DESTDIR)$(BINDIR)/pg_passwd$(X)
360
361 .PHONY: submake
362 submake:
363diff -Nru postgresql-7.0.2/src/bin/pg_version/Makefile.in postgresql-7.0.2.new/src/bin/pg_version/Makefile.in
364--- postgresql-7.0.2/src/bin/pg_version/Makefile.in Mon Jul 24 10:56:31 2000
365+++ postgresql-7.0.2.new/src/bin/pg_version/Makefile.in Thu Jul 6 10:01:02 2000
366@@ -27,7 +27,8 @@
367 $(MAKE) -C $(SRCDIR)/utils version.o
368
369 install: pg_version
370- $(INSTALL) $(INSTL_EXE_OPTS) pg_version$(X) $(BINDIR)/pg_version$(X)
371+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
372+ $(INSTALL) $(INSTL_EXE_OPTS) pg_version$(X) $(DESTDIR)$(BINDIR)/pg_version$(X)
373
374 depend dep:
375 $(CC) -MM $(CFLAGS) *.c >depend
376diff -Nru postgresql-7.0.2/src/bin/pgaccess/Makefile postgresql-7.0.2.new/src/bin/pgaccess/Makefile
377--- postgresql-7.0.2/src/bin/pgaccess/Makefile Mon Jul 24 10:56:31 2000
378+++ postgresql-7.0.2.new/src/bin/pgaccess/Makefile Wed Jul 12 18:41:32 2000
379@@ -21,17 +21,15 @@
380 > pgaccess
381
382 install:
383- $(INSTALL) $(INSTL_EXE_OPTS) pgaccess $(BINDIR)/pgaccess
384- -@if [ ! -d $(POSTGRESDIR)/pgaccess ]; then mkdir $(POSTGRESDIR)/pgaccess; fi
385- $(INSTALL) $(INSTL_EXE_OPTS) main.tcl $(POSTGRESDIR)/pgaccess
386- -@if [ ! -d $(POSTGRESDIR)/pgaccess/lib ]; then mkdir $(POSTGRESDIR)/pgaccess/lib; fi
387- $(INSTALL) $(INSTLOPTS) lib/*.tcl $(POSTGRESDIR)/pgaccess/lib
388- -@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/help ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/help; fi
389- $(INSTALL) $(INSTLOPTS) lib/help/*.hlp $(POSTGRESDIR)/pgaccess/lib/help
390- -@if [ ! -d $(POSTGRESDIR)/pgaccess/lib/languages ]; then mkdir $(POSTGRESDIR)/pgaccess/lib/languages; fi
391- $(INSTALL) $(INSTLOPTS) lib/languages/[a-z]* $(POSTGRESDIR)/pgaccess/lib/languages
392- -@if [ ! -d $(POSTGRESDIR)/pgaccess/images ]; then mkdir $(POSTGRESDIR)/pgaccess/images; fi
393- $(INSTALL) $(INSTLOPTS) images/*.gif $(POSTGRESDIR)/pgaccess/images
394+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pgaccess/help
395+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pgaccess/anguages
396+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)/pgaccess/images
397+ $(INSTALL) $(INSTL_EXE_OPTS) pgaccess $(DESTDIR)$(BINDIR)/pgaccess
398+ $(INSTALL) $(INSTL_EXE_OPTS) main.tcl $(DESTDIR)$(LIBDIR)/pgaccess
399+ $(INSTALL) $(INSTLOPTS) lib/*.tcl $(DESTDIR)$(LIBDIR)/pgaccess
400+ $(INSTALL) $(INSTLOPTS) lib/help/*.hlp $(DESTDIR)$(LIBDIR)/pgaccess/help
401+ $(INSTALL) $(INSTLOPTS) lib/languages/[a-z]* $(DESTDIR)$(LIBDIR)/pgaccess/languages
402+ $(INSTALL) $(INSTLOPTS) images/*.gif $(DESTDIR)$(LIBDIR)/pgaccess/images
403
404 clean:
405 rm -f pgaccess
406diff -Nru postgresql-7.0.2/src/bin/pgtclsh/Makefile postgresql-7.0.2.new/src/bin/pgtclsh/Makefile
407--- postgresql-7.0.2/src/bin/pgtclsh/Makefile Mon Jul 24 10:56:31 2000
408+++ postgresql-7.0.2.new/src/bin/pgtclsh/Makefile Thu Jul 6 10:01:02 2000
409@@ -53,10 +53,12 @@
410 install: $(INSTPGMS)
411
412 install_tcl: pgtclsh
413- $(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(BINDIR)/pgtclsh
414+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
415+ $(INSTALL) $(INSTL_EXE_OPTS) pgtclsh $(DESTDIR)$(BINDIR)/pgtclsh
416
417 install_tk: pgtksh
418- $(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(BINDIR)/pgtksh
419+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
420+ $(INSTALL) $(INSTL_EXE_OPTS) pgtksh $(DESTDIR)$(BINDIR)/pgtksh
421
422 Makefile.tcldefs: mkMakefile.tcldefs.sh
423 /bin/sh mkMakefile.tcldefs.sh
424diff -Nru postgresql-7.0.2/src/bin/psql/Makefile.in postgresql-7.0.2.new/src/bin/psql/Makefile.in
425--- postgresql-7.0.2/src/bin/psql/Makefile.in Mon Jul 24 10:56:31 2000
426+++ postgresql-7.0.2.new/src/bin/psql/Makefile.in Thu Jul 6 10:01:02 2000
427@@ -76,7 +76,8 @@
428 $(MAKE) -C $(LIBPQDIR) libpq.a
429
430 install: psql
431- $(INSTALL) $(INSTL_EXE_OPTS) psql$(X) $(BINDIR)/psql$(X)
432+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
433+ $(INSTALL) $(INSTL_EXE_OPTS) psql$(X) $(DESTDIR)$(BINDIR)/psql$(X)
434
435 depend dep:
436 $(CC) -MM -MG $(CFLAGS) *.c >depend
437diff -Nru postgresql-7.0.2/src/bin/scripts/Makefile postgresql-7.0.2.new/src/bin/scripts/Makefile
438--- postgresql-7.0.2/src/bin/scripts/Makefile Mon Jul 24 10:56:31 2000
439+++ postgresql-7.0.2.new/src/bin/scripts/Makefile Thu Jul 6 10:01:02 2000
440@@ -32,7 +32,8 @@
441 vacuumdb:
442
443 install: $(SCRIPTS)
444- for i in $+; do $(INSTALL) $(INSTL_EXE_OPTS) $$i $(BINDIR); done
445+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
446+ for i in $+; do $(INSTALL) $(INSTL_EXE_OPTS) $$i $(DESTDIR)$(BINDIR); done
447
448 clean:
449 rm -f createlang
450diff -Nru postgresql-7.0.2/src/interfaces/ecpg/include/Makefile postgresql-7.0.2.new/src/interfaces/ecpg/include/Makefile
451--- postgresql-7.0.2/src/interfaces/ecpg/include/Makefile Mon Jul 24 10:56:31 2000
452+++ postgresql-7.0.2.new/src/interfaces/ecpg/include/Makefile Thu Jul 6 10:01:02 2000
453@@ -6,11 +6,12 @@
454 @echo Nothing to be done.
455
456 install::
457- $(INSTALL) $(INSTLOPTS) ecpgerrno.h $(HEADERDIR)
458- $(INSTALL) $(INSTLOPTS) ecpglib.h $(HEADERDIR)
459- $(INSTALL) $(INSTLOPTS) ecpgtype.h $(HEADERDIR)
460- $(INSTALL) $(INSTLOPTS) sqlca.h $(HEADERDIR)
461- $(INSTALL) $(INSTLOPTS) sql3types.h $(HEADERDIR)
462+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)
463+ $(INSTALL) $(INSTLOPTS) ecpgerrno.h $(DESTDIR)$(HEADERDIR)
464+ $(INSTALL) $(INSTLOPTS) ecpglib.h $(DESTDIR)$(HEADERDIR)
465+ $(INSTALL) $(INSTLOPTS) ecpgtype.h $(DESTDIR)$(HEADERDIR)
466+ $(INSTALL) $(INSTLOPTS) sqlca.h $(DESTDIR)$(HEADERDIR)
467+ $(INSTALL) $(INSTLOPTS) sql3types.h $(DESTDIR)$(HEADERDIR)
468
469 uninstall::
470 rm -f $(HEADERDIR)/ecpgerrno.h
471diff -Nru postgresql-7.0.2/src/interfaces/ecpg/preproc/Makefile.in postgresql-7.0.2.new/src/interfaces/ecpg/preproc/Makefile.in
472--- postgresql-7.0.2/src/interfaces/ecpg/preproc/Makefile.in Mon Jul 24 10:56:31 2000
473+++ postgresql-7.0.2.new/src/interfaces/ecpg/preproc/Makefile.in Thu Jul 6 10:01:02 2000
474@@ -42,7 +42,8 @@
475 # to ship those files in the distribution, for people with inadequate tools.
476
477 install: all
478- $(INSTALL) $(INSTL_EXE_OPTS) ecpg$(X) $(BINDIR)
479+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
480+ $(INSTALL) $(INSTL_EXE_OPTS) ecpg$(X) $(DESTDIR)$(BINDIR)
481
482 uninstall:
483 rm -f $(BINDIR)/ecpg
484diff -Nru postgresql-7.0.2/src/interfaces/libpgeasy/Makefile.in postgresql-7.0.2.new/src/interfaces/libpgeasy/Makefile.in
485--- postgresql-7.0.2/src/interfaces/libpgeasy/Makefile.in Mon Jul 24 10:56:31 2000
486+++ postgresql-7.0.2.new/src/interfaces/libpgeasy/Makefile.in Thu Jul 6 10:01:02 2000
487@@ -39,8 +39,8 @@
488 install: install-headers install-lib $(install-shlib-dep)
489
490 install-headers: libpgeasy.h
491- -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
492- $(INSTALL) $(INSTLOPTS) libpgeasy.h $(HEADERDIR)/libpgeasy.h
493+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)
494+ $(INSTALL) $(INSTLOPTS) libpgeasy.h $(DESTDIR)$(HEADERDIR)/libpgeasy.h
495
496 .PHONY: clean
497
498diff -Nru postgresql-7.0.2/src/interfaces/libpgtcl/Makefile.in postgresql-7.0.2.new/src/interfaces/libpgtcl/Makefile.in
499--- postgresql-7.0.2/src/interfaces/libpgtcl/Makefile.in Mon Jul 24 10:56:31 2000
500+++ postgresql-7.0.2.new/src/interfaces/libpgtcl/Makefile.in Thu Jul 6 10:01:02 2000
501@@ -43,11 +43,8 @@
502 install: install-headers install-lib $(install-shlib-dep)
503
504 install-headers: beforeinstall-headers libpgtcl.h
505- $(INSTALL) $(INSTLOPTS) libpgtcl.h $(HEADERDIR)/libpgtcl.h
506-
507-beforeinstall-headers:
508- -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
509-
510+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)
511+ $(INSTALL) $(INSTLOPTS) libpgtcl.h $(DESTDIR)$(HEADERDIR)/libpgtcl.h
512
513 .PHONY: clean
514
515diff -Nru postgresql-7.0.2/src/interfaces/libpq/Makefile.in postgresql-7.0.2.new/src/interfaces/libpq/Makefile.in
516--- postgresql-7.0.2/src/interfaces/libpq/Makefile.in Mon Jul 24 10:56:31 2000
517+++ postgresql-7.0.2.new/src/interfaces/libpq/Makefile.in Thu Jul 6 10:01:02 2000
518@@ -83,11 +83,10 @@
519 install: install-headers install-lib $(install-shlib-dep)
520
521 install-headers: libpq-fe.h libpq-int.h
522- -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
523- $(INSTALL) $(INSTLOPTS) libpq-fe.h $(HEADERDIR)/libpq-fe.h
524- $(INSTALL) $(INSTLOPTS) libpq-int.h $(HEADERDIR)/libpq-int.h
525- $(INSTALL) $(INSTLOPTS) pqexpbuffer.h $(HEADERDIR)/pqexpbuffer.h
526-
527+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)
528+ $(INSTALL) $(INSTLOPTS) libpq-fe.h $(DESTDIR)$(HEADERDIR)/libpq-fe.h
529+ $(INSTALL) $(INSTLOPTS) libpq-int.h $(DESTDIR)$(HEADERDIR)/libpq-int.h
530+ $(INSTALL) $(INSTLOPTS) pqexpbuffer.h $(DESTDIR)$(HEADERDIR)/pqexpbuffer.h
531
532 .PHONY: clean
533
534diff -Nru postgresql-7.0.2/src/interfaces/libpq++/Makefile.in postgresql-7.0.2.new/src/interfaces/libpq++/Makefile.in
535--- postgresql-7.0.2/src/interfaces/libpq++/Makefile.in Mon Jul 24 10:56:31 2000
536+++ postgresql-7.0.2.new/src/interfaces/libpq++/Makefile.in Thu Jul 6 10:01:02 2000
537@@ -73,16 +73,13 @@
538 pgcursordb.h \
539 pglobject.h
540
541-install-headers: beforeinstall-headers $(MAINHEADER)
542- @$(INSTALL) $(INSTLOPTS) $(MAINHEADER) $(HEADERDIR)/$(MAINHEADER)
543+install-headers: $(MAINHEADER)
544+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR) $(DESTDIR)$(LIBPGXXHEADERDIR)
545+ @$(INSTALL) $(MAINHEADER) $(DESTDIR)$(HEADERDIR)/$(MAINHEADER)
546 @for i in ${LIBPGXXHEADERS}; do \
547 echo "Installing $(LIBPGXXHEADERDIR)/$$i."; \
548- $(INSTALL) $(INSTLOPTS) $$i $(LIBPGXXHEADERDIR)/$$i; \
549+ $(INSTALL) $(INSTLOPTS) $$i $(DESTDIR)$(LIBPGXXHEADERDIR)/$$i; \
550 done
551-
552-beforeinstall-headers:
553- -@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
554- -@if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
555
556 .PHONY: clean
557
558diff -Nru postgresql-7.0.2/src/interfaces/odbc/GNUmakefile.in postgresql-7.0.2.new/src/interfaces/odbc/GNUmakefile.in
559--- postgresql-7.0.2/src/interfaces/odbc/GNUmakefile.in Mon Jul 24 10:56:31 2000
560+++ postgresql-7.0.2.new/src/interfaces/odbc/GNUmakefile.in Mon Jul 24 10:57:29 2000
561@@ -15,6 +15,7 @@
562 NAME = psqlodbc
563 SRCDIR= @top_srcdir@
564 ODBCSRCDIR= @srcdir@
565+sysconfdir= @sysconfdir@
566 include $(SRCDIR)/Makefile.global
567
568 include Version.mk
569@@ -46,22 +47,17 @@
570
571 .PHONY: install install-ini beforeinstall-headers install-headers
572
573-install: $(HEADERDIR) $(LIBDIR) $(ODBCINST) install-headers \
574- install-ini install-lib $(install-shlib-dep)
575+install: install-headers install-ini install-lib $(install-shlib-dep)
576
577-$(HEADERDIR) $(LIBDIR) $(ODBCINST):
578- mkdir -p $@
579-
580-install-headers: beforeinstall-headers isql.h isqlext.h iodbc.h
581- $(INSTALL) $(INSTLOPTS) iodbc.h $(HEADERDIR)/iodbc/iodbc.h
582- $(INSTALL) $(INSTLOPTS) isql.h $(HEADERDIR)/iodbc/isql.h
583- $(INSTALL) $(INSTLOPTS) isqlext.h $(HEADERDIR)/iodbc/isqlext.h
584-
585-beforeinstall-headers:
586- @if [ ! -d $(HEADERDIR)/iodbc ]; then mkdir -p $(HEADERDIR)/iodbc; fi
587+install-headers: isql.h isqlext.h iodbc.h
588+ $(INSTALL) -d $(DESTDIR)$(HEADERDIR)/iodbc
589+ $(INSTALL) $(INSTLOPTS) iodbc.h $(DESTDIR)$(HEADERDIR)/iodbc/iodbc.h
590+ $(INSTALL) $(INSTLOPTS) isql.h $(DESTDIR)$(HEADERDIR)/iodbc/isql.h
591+ $(INSTALL) $(INSTLOPTS) isqlext.h $(DESTDIR)$(HEADERDIR)/iodbc/isqlext.h
592
593 install-ini: odbcinst.ini
594- $(INSTALL) $(INSTL_LIB_OPTS) odbcinst.ini $(ODBCINST)/odbcinst.ini
595+ $(INSTALL) -d $(DESTDIR)$(sysconfdir)
596+ $(INSTALL) $(INSTL_LIB_OPTS) odbcinst.ini $(DESTDIR)$(sysconfdir)/odbcinst.ini
597
598 .PHONY: clean
599
600diff -Nru postgresql-7.0.2/src/interfaces/odbc/Makefile.global.in postgresql-7.0.2.new/src/interfaces/odbc/Makefile.global.in
601--- postgresql-7.0.2/src/interfaces/odbc/Makefile.global.in Mon Jul 24 10:56:31 2000
602+++ postgresql-7.0.2.new/src/interfaces/odbc/Makefile.global.in Sat Jul 22 08:10:28 2000
603@@ -78,11 +78,11 @@
604 #POSTDOCDIR= $(POSTGRESDIR)/doc
bd2eb624
AF		 605
606 # Where the header files necessary to build frontend programs get installed.
563217a7 607-HEADERDIR= $(POSTGRESDIR)/include
608+HEADERDIR= @includedir@/pgsql
609
610 # Where the odbcinst.ini file will be placed
611
612-ODBCINST= @ODBCINST@
613+sysconfdir= @sysconfdir@
614
615 ##############################################################################
616 #
617diff -Nru postgresql-7.0.2/src/pl/plpgsql/src/Makefile.in postgresql-7.0.2.new/src/pl/plpgsql/src/Makefile.in
618--- postgresql-7.0.2/src/pl/plpgsql/src/Makefile.in Mon Jul 24 10:56:31 2000
619+++ postgresql-7.0.2.new/src/pl/plpgsql/src/Makefile.in Wed Jul 12 18:42:56 2000
620@@ -40,7 +40,8 @@
621
622 install: $(shlib)
623 ifneq ($(shlib),)
624- $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(LIBDIR)/plpgsql$(DLSUFFIX)
625+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)
626+ $(INSTALL) $(INSTL_SHLIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)/plpgsql$(DLSUFFIX)
627 else
628 @echo "plpgsql not installed due to lack of shared library support."
629 endif
630diff -Nru postgresql-7.0.2/src/pl/tcl/Makefile postgresql-7.0.2.new/src/pl/tcl/Makefile
631--- postgresql-7.0.2/src/pl/tcl/Makefile Mon Jul 24 10:56:31 2000
632+++ postgresql-7.0.2.new/src/pl/tcl/Makefile Wed Jul 12 18:44:19 2000
633@@ -103,7 +103,8 @@
634 all: $(INFILES)
635
636 install: all
637- $(INSTALL) $(INSTL_SHLIB_OPTS) $(DLOBJS) $(LIBDIR)/$(DLOBJS)
638+ $(INSTALL) -d $(DESTDIR)$(LIBDIR)
639+ $(INSTALL) $(INSTL_SHLIB_OPTS) $(DLOBJS) $(DESTDIR)$(LIBDIR)/$(DLOBJS)
640
641 else
642
PostgreSQL Data Base Management System
This page took 0.123424 seconds and 4 git commands to generate.