Author: arekm Date: Wed Dec 6 21:22:28 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated
---- Files affected:
SOURCES:
postgresql-ecpg_link.patch (1.3 -> 1.4) , postgresql-ecpg-includedir.patch
(1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/postgresql-ecpg_link.patch
diff -u SOURCES/postgresql-ecpg_link.patch:1.3
SOURCES/postgresql-ecpg_link.patch:1.4
--- SOURCES/postgresql-ecpg_link.patch:1.3 Wed Jan 19 09:41:37 2005
+++ SOURCES/postgresql-ecpg_link.patch Wed Dec 6 22:22:23 2006
@@ -1,11 +1,12 @@
--- postgresql-8.0.0beta2/src/interfaces/ecpg/compatlib/Makefile
2004-09-05 21:38:27.750369536 +0200
+++ postgresql-8.0.0beta2/src/interfaces/ecpg/compatlib/Makefile.new
2004-09-05 21:40:03.741776624 +0200
@@ -20,7 +20,7 @@
- override CPPFLAGS := -I$(top_srcdir)/src/interfaces/ecpg/include
-I$(libpq_srcdir) \
- -I$(top_srcdir)/src/include/utils $(CPPFLAGS)
+ override CPPFLAGS := -I../include -I$(top_srcdir)/src/interfaces/ecpg/include
\
+ -I$(libpq_srcdir) -I$(top_srcdir)/src/include/utils $(CPPFLAGS)
override CFLAGS += $(PTHREAD_CFLAGS)
--SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) \
-+SHLIB_LINK = ../ecpglib/libecpg.so -L../pgtypeslib -lpgtypes $(libpq) \
- $(filter -lintl -lssl -lcrypto -lkrb5 -lcrypt -lm, $(LIBS))
$(PTHREAD_LIBS)
+-SHLIB_LINK = -L../ecpglib -lecpg -L../pgtypeslib -lpgtypes $(libpq) -lm \
++SHLIB_LINK = ../ecpglib/libecpg.so -L../pgtypeslib -lpgtypes $(libpq) -lm \
+ $(PTHREAD_LIBS)
OBJS= informix.o
+
================================================================
Index: SOURCES/postgresql-ecpg-includedir.patch
diff -u SOURCES/postgresql-ecpg-includedir.patch:1.2
SOURCES/postgresql-ecpg-includedir.patch:1.3
--- SOURCES/postgresql-ecpg-includedir.patch:1.2 Wed Dec 24 00:04:42 2003
+++ SOURCES/postgresql-ecpg-includedir.patch Wed Dec 6 22:22:23 2006
@@ -1,17 +1,19 @@
--- postgresql-7.4.1/src/interfaces/ecpg/include/Makefile.orig 2003-12-18
19:55:05.000000000 +0100
+++ postgresql-7.4.1/src/interfaces/ecpg/include/Makefile 2003-12-23
18:57:34.712017440 +0100
-@@ -12,11 +12,11 @@
+@@ -19,12 +19,12 @@
informix_headers = datetime.h decimal.h sqltypes.h sqlda.h
install-headers: $(ecpg_headers) $(informix_headers)
-- for i in $(ecpg_headers); do $(INSTALL_DATA) $(srcdir)/$$i
$(DESTDIR)$(includedir) || exit; done
-- for i in $(informix_headers); do $(INSTALL_DATA) $(srcdir)/$$i
$(DESTDIR)$(informix_esql_dir) || exit; done
-+ for i in $(ecpg_headers); do $(INSTALL_DATA) $(srcdir)/$$i
$(DESTDIR)$(includedir)/ecpg || exit; done
-+ for i in $(informix_headers); do $(INSTALL_DATA) $(srcdir)/$$i
$(DESTDIR)$(includedir)/ecpg || exit; done
+- for i in $(ecpg_headers); do $(INSTALL_DATA) $(srcdir)/$$i
'$(DESTDIR)$(includedir)' || exit; done
+- for i in $(informix_headers); do $(INSTALL_DATA) $(srcdir)/$$i
'$(DESTDIR)$(informix_esql_dir)' || exit; done
++ for i in $(ecpg_headers); do $(INSTALL_DATA) $(srcdir)/$$i
'$(DESTDIR)$(includedir)/ecpg' || exit; done
++ for i in $(informix_headers); do $(INSTALL_DATA) $(srcdir)/$$i
'$(DESTDIR)$(includedir)/ecpg' || exit; done
+ $(INSTALL_DATA) $(ecpg_config_h) '$(DESTDIR)$(includedir)'
installdirs:
-- $(mkinstalldirs) $(DESTDIR)$(includedir) $(DESTDIR)$(informix_esql_dir)
-+ $(mkinstalldirs) $(DESTDIR)$(includedir)/ecpg
+- $(mkinstalldirs) '$(DESTDIR)$(includedir)'
'$(DESTDIR)$(informix_esql_dir)'
++ $(mkinstalldirs) '$(DESTDIR)$(includedir)/ecpg'
uninstall:
- rm -f $(addprefix $(DESTDIR)$(includedir)/, $(ecpg_headers))
+ rm -f $(addprefix '$(DESTDIR)$(includedir)'/, $(ecpg_headers))
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/postgresql-ecpg_link.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/SOURCES/postgresql-ecpg-includedir.patch?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
