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
|
diff -Nru postgresql-7.4.14.orig/src/interfaces/libpq/Makefile postgresql-7.4.14/src/interfaces/libpq/Makefile
--- postgresql-7.4.14.orig/src/interfaces/libpq/Makefile 2006-11-05 13:20:18.000000000 +0100
+++ postgresql-7.4.14/src/interfaces/libpq/Makefile 2006-11-05 13:23:46.000000000 +0100
@@ -18,6 +18,8 @@
SO_MAJOR_VERSION= 3
SO_MINOR_VERSION= 1
+NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION)
+
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS) $(THREAD_CPPFLAGS) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"'
OBJS= fe-auth.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-lobj.o \
@@ -66,7 +68,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-7.4.14.orig/src/interfaces/libpq/nls.mk postgresql-7.4.14/src/interfaces/libpq/nls.mk
--- postgresql-7.4.14.orig/src/interfaces/libpq/nls.mk 2006-11-05 13:20:18.000000000 +0100
+++ postgresql-7.4.14/src/interfaces/libpq/nls.mk 2006-11-05 13:23:46.000000000 +0100
@@ -1,5 +1,5 @@
# $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.13.2.1 2004/10/30 08:22:16 petere Exp $
-CATALOG_NAME := libpq
+CATALOG_NAME := libpq-3
AVAIL_LANGUAGES := cs de es fr hr it nb pt_BR ru sl sv tr zh_CN zh_TW
GETTEXT_FILES := fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-secure.c
GETTEXT_TRIGGERS:= libpq_gettext pqInternalNotice:2
diff -Nru postgresql-7.4.14.orig/src/Makefile.shlib postgresql-7.4.14/src/Makefile.shlib
--- postgresql-7.4.14.orig/src/Makefile.shlib 2006-11-05 13:20:18.000000000 +0100
+++ postgresql-7.4.14/src/Makefile.shlib 2006-11-05 13:23:46.000000000 +0100
@@ -229,7 +229,7 @@
all-lib: all-static-lib all-shared-lib
-all-static-lib: lib$(NAME).a
+all-static-lib: lib$(NAME_STATIC_LIB).a
all-shared-lib: $(shlib)
@@ -239,7 +239,7 @@
MK_NO_LORDER := true
endif
-lib$(NAME).a: $(OBJS)
+lib$(NAME_STATIC_LIB).a: $(OBJS)
ifdef MK_NO_LORDER
$(LINK.static) $@ $^
else
@@ -310,11 +310,11 @@
.PHONY: install-lib install-lib-static install-lib-shared
install-lib: install-lib-static install-lib-shared
-install-lib-static: lib$(NAME).a
- $(INSTALL_STLIB) $< $(DESTDIR)$(libdir)/lib$(NAME).a
+install-lib-static: lib$(NAME_STATIC_LIB).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)
|
GitWeb
