summaryrefslogtreecommitdiff
blob: 63c27e9e7f618030c0c7b0027a32899c83a60863 (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
diff -Nru postgresql-8.1.4.orig/src/bin/pg_config/Makefile postgresql-8.1.4/src/bin/pg_config/Makefile
--- postgresql-8.1.4.orig/src/bin/pg_config/Makefile	2006-09-25 18:18:44.000000000 +0200
+++ postgresql-8.1.4/src/bin/pg_config/Makefile	2006-09-25 18:21:49.000000000 +0200
@@ -35,7 +35,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-8.1$(X)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
diff -Nru postgresql-8.1.4.orig/src/interfaces/libpq/Makefile postgresql-8.1.4/src/interfaces/libpq/Makefile
--- postgresql-8.1.4.orig/src/interfaces/libpq/Makefile	2006-09-25 18:18:44.000000000 +0200
+++ postgresql-8.1.4/src/interfaces/libpq/Makefile	2006-09-25 18:21:57.000000000 +0200
@@ -16,10 +16,12 @@
 
 # shared library parameters
 NAME= pq
-SO_MAJOR_VERSION= 4
+SO_MAJOR_VERSION= 8
 SO_MINOR_VERSION= 1
 DLTYPE= library
 
+NAME_STATIC_LIB= $(NAME)-$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
+
 override CPPFLAGS :=  -DFRONTEND -I$(srcdir) $(CPPFLAGS) -I$(top_builddir)/src/port
 ifneq ($(PORTNAME), win32)
 override CFLAGS += $(PTHREAD_CFLAGS)
@@ -135,7 +137,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).$(SO_MINOR_VERSION).conf.sample
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir_internal)
diff -Nru postgresql-8.1.4.orig/src/Makefile.shlib postgresql-8.1.4/src/Makefile.shlib
--- postgresql-8.1.4.orig/src/Makefile.shlib	2006-09-25 18:18:44.000000000 +0200
+++ postgresql-8.1.4/src/Makefile.shlib	2006-09-25 18:21:49.000000000 +0200
@@ -366,10 +366,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.1.4.orig/src/nls-global.mk postgresql-8.1.4/src/nls-global.mk
--- postgresql-8.1.4.orig/src/nls-global.mk	2006-09-25 18:18:44.000000000 +0200
+++ postgresql-8.1.4/src/nls-global.mk	2006-09-25 18:21:49.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)-8.1.mo || exit 1; \
 	done
 endif