ecpg.patch (wrong makefile expansion in some cases)

        the ecpg Makefiles use a variable DESTDIR which is never defined
        except by debian/rules makefile, in which case the ecpg makefiles
        expand wrong pathnames. If we want to support a DESTDIR root it
        must be done consistently in all the makefiles, not just in ecpg.

From: Massimo Dal Zotto <dz@cs.unitn.it>

diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile
index 836fba3..db0ea79 100644 (file)
--- a/src/interfaces/ecpg/include/Makefile
+++ b/src/interfaces/ecpg/include/Makefile
@@ -6,15 +6,15 @@ all clean::
        @echo Nothing to be done.
 
 install::
-       $(INSTALL) $(INSTLOPTS) ecpgerrno.h $(DESTDIR)$(HEADERDIR)      
-       $(INSTALL) $(INSTLOPTS) ecpglib.h $(DESTDIR)$(HEADERDIR)        
-       $(INSTALL) $(INSTLOPTS) ecpgtype.h $(DESTDIR)$(HEADERDIR)       
-       $(INSTALL) $(INSTLOPTS) sqlca.h $(DESTDIR)$(HEADERDIR)  
+       $(INSTALL) $(INSTLOPTS) ecpgerrno.h $(HEADERDIR)        
+       $(INSTALL) $(INSTLOPTS) ecpglib.h $(HEADERDIR)  
+       $(INSTALL) $(INSTLOPTS) ecpgtype.h $(HEADERDIR) 
+       $(INSTALL) $(INSTLOPTS) sqlca.h $(HEADERDIR)    
 
 uninstall::
-       rm -f $(DESTDIR)$(HEADERDIR)/ecpgerrno.h
-       rm -f $(DESTDIR)$(HEADERDIR)/ecpglib.h
-       rm -f $(DESTDIR)$(HEADERDIR)/ecpgtype.h
-       rm -f $(DESTDIR)$(HEADERDIR)/sqlca.h
+       rm -f $(HEADERDIR)/ecpgerrno.h
+       rm -f $(HEADERDIR)/ecpglib.h
+       rm -f $(HEADERDIR)/ecpgtype.h
+       rm -f $(HEADERDIR)/sqlca.h
 
 dep depend:

diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 6952b07..80ac744 100644 (file)
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -7,7 +7,7 @@ PATCHLEVEL=0
 
 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \
        -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
-       -DINCLUDE_PATH=\"$(DESTDIR)$(HEADERDIR)\"
+       -DINCLUDE_PATH=\"$(HEADERDIR)\"
 
 OBJ=preproc.o pgc.o type.o ecpg.o ecpg_keywords.o ../../../backend/parser/scansup.o \
     keywords.o c_keywords.o ../lib/typename.o
@@ -27,10 +27,10 @@ clean:
 # to ship those files in the distribution, for people with inadequate tools.
 
 install: all
-       $(INSTALL) $(INSTL_EXE_OPTS) ecpg$(X) $(DESTDIR)$(BINDIR)
+       $(INSTALL) $(INSTL_EXE_OPTS) ecpg$(X) $(BINDIR)
 
 uninstall:
-       rm -f $(DESTDIR)$(BINDIR)/ecpg
+       rm -f $(BINDIR)/ecpg
 
 # Rule that really do something.
 ecpg: $(OBJ)