- updated

Changed files:
    postgresql-ecpg-includedir.patch -> 1.3
    postgresql-ecpg_link.patch -> 1.4

diff --git a/postgresql-ecpg-includedir.patch b/postgresql-ecpg-includedir.patch
index 3c6352a973361fe25670432952123e3e0f375476..bc82b97d16ca02ffe6d5803a3fc34b62e76a1365 100644 (file)
--- a/postgresql-ecpg-includedir.patch
+++ b/postgresql-ecpg-includedir.patch
@@ -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))
+

diff --git a/postgresql-ecpg_link.patch b/postgresql-ecpg_link.patch
index dc7b168f449e1b073088bd3fb5f594a6eb26e722..d7c8e6dc393197f3383ea042b6815b744efb0a85 100644 (file)
--- a/postgresql-ecpg_link.patch
+++ b/postgresql-ecpg_link.patch
@@ -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
+