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
|
diff -Nru postgresql-8.0.8.orig/src/bin/pg_config/Makefile postgresql-8.0.8/src/bin/pg_config/Makefile
--- postgresql-8.0.8.orig/src/bin/pg_config/Makefile 2006-09-25 00:58:33.000000000 +0200
+++ postgresql-8.0.8/src/bin/pg_config/Makefile 2006-09-25 01:00:54.000000000 +0200
@@ -23,7 +23,7 @@
$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
install: all installdirs
- $(INSTALL_SCRIPT) pg_config$(X) $(DESTDIR)$(bindir)/pg_config$(X)
+ $(INSTALL_SCRIPT) pg_config$(X) $(DESTDIR)$(bindir)/pg_config-4$(X)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir)
diff -Nru postgresql-8.0.8.orig/src/interfaces/libpq/Makefile postgresql-8.0.8/src/interfaces/libpq/Makefile
--- postgresql-8.0.8.orig/src/interfaces/libpq/Makefile 2006-09-25 00:58:32.000000000 +0200
+++ postgresql-8.0.8/src/interfaces/libpq/Makefile 2006-09-25 00:59:12.000000000 +0200
@@ -20,6 +20,8 @@
SO_MINOR_VERSION= 0
DLTYPE= library
+NAME_STATIC_LIB= pq-$(SO_MAJOR_VERSION)
+
override CPPFLAGS := -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
override CFLAGS += $(PTHREAD_CFLAGS)
@@ -136,7 +138,7 @@
$(INSTALL_DATA) $(srcdir)/libpq-fe.h $(DESTDIR)$(includedir)
$(INSTALL_DATA) $(srcdir)/libpq-int.h $(DESTDIR)$(includedir_internal)
$(INSTALL_DATA) $(srcdir)/pqexpbuffer.h $(DESTDIR)$(includedir_internal)
- $(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service.conf.sample
+ $(INSTALL_DATA) $(srcdir)/pg_service.conf.sample $(DESTDIR)$(datadir)/pg_service-$(SO_MAJOR_VERSION).conf.sample
installdirs:
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal)
diff -Nru postgresql-8.0.8.orig/src/Makefile.shlib postgresql-8.0.8/src/Makefile.shlib
--- postgresql-8.0.8.orig/src/Makefile.shlib 2006-09-25 00:58:32.000000000 +0200
+++ postgresql-8.0.8/src/Makefile.shlib 2006-09-25 00:59:12.000000000 +0200
@@ -360,10 +360,10 @@
install-lib: install-lib-static install-lib-shared
install-lib-static: lib$(NAME).a
- $(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
+ $(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME_STATIC_LIB).a
ifeq ($(PORTNAME), darwin)
cd $(DESTDIR)$(libdir) && \
- ranlib lib$(NAME).a
+ ranlib lib$(NAME_STATIC_LIB).a
endif
ifeq ($(enable_shared), yes)
diff -Nru postgresql-8.0.8.orig/src/nls-global.mk postgresql-8.0.8/src/nls-global.mk
--- postgresql-8.0.8.orig/src/nls-global.mk 2006-09-25 00:58:33.000000000 +0200
+++ postgresql-8.0.8/src/nls-global.mk 2006-09-25 00:59:44.000000000 +0200
@@ -65,7 +65,7 @@
install-po: all-po installdirs-po
ifneq (,$(LANGUAGES))
for lang in $(LANGUAGES); do \
- $(INSTALL_DATA) po/$$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(CATALOG_NAME).mo || exit 1; \
+ $(INSTALL_DATA) po/$$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(CATALOG_NAME)-4.mo || exit 1; \
done
endif
|
GitWeb
