6 files changed, 28 insertions, 28 deletions
diff --git a/src/interfaces/ecpg/include/Makefile b/src/interfaces/ecpg/include/Makefile
index 2658dd00483..739023a43e4 100644
--- a/src/interfaces/ecpg/include/Makefile
+++ b/src/interfaces/ecpg/include/Makefile
@@ -6,11 +6,11 @@ all clean::
 	@echo Nothing to be done.
 
 install::
-	$(INSTALL) $(INSTLOPTS) ecpglib.h $(DESTDIR)$(HEADERDIR)	
-	$(INSTALL) $(INSTLOPTS) ecpgtype.h $(DESTDIR)$(HEADERDIR)	
-	$(INSTALL) $(INSTLOPTS) sqlca.h $(DESTDIR)$(HEADERDIR)	
+	$(INSTALL) $(INSTLOPTS) ecpglib.h $(HEADERDIR)	
+	$(INSTALL) $(INSTLOPTS) ecpgtype.h $(HEADERDIR)	
+	$(INSTALL) $(INSTLOPTS) sqlca.h $(HEADERDIR)	
 
 uninstall::
-	rm -f $(DESTDIR)$(HEADERDIR)/ecpglib.h
-	rm -f $(DESTDIR)$(HEADERDIR)/ecpgtype.h
-	rm -f $(DESTDIR)$(HEADERDIR)/sqlca.h
+	rm -f $(HEADERDIR)/ecpglib.h
+	rm -f $(HEADERDIR)/ecpgtype.h
+	rm -f $(HEADERDIR)/sqlca.h
diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in
index a39af1df627..b2da50ebe34 100644
--- a/src/interfaces/ecpg/lib/Makefile.in
+++ b/src/interfaces/ecpg/lib/Makefile.in
@@ -54,14 +54,14 @@ clean:
 	rm -f *.o *.a core a.out *~ $(shlib) libecpg.so
 
 install: libecpg.a $(shlib) $(install-shlib-dep)
-	$(INSTALL) $(INSTLOPTS) libecpg.a $(DESTDIR)$(LIBDIR)
+	$(INSTALL) $(INSTLOPTS) libecpg.a $(LIBDIR)
 
 install-shlib:
-	$(INSTALL) $(INSTLOPTS) $(shlib) $(DESTDIR)$(LIBDIR)
-	ln -sf $(shlib) $(DESTDIR)$(LIBDIR)/libecpg.so
+	$(INSTALL) $(INSTLOPTS) $(shlib) $(LIBDIR)
+	ln -sf $(shlib) $(LIBDIR)/libecpg.so
 
 uninstall::
-	rm -f $(DESTDIR)$(LIBDIR)/libecpg.a $(DESTDIR)$(LIBDIR)/$(shlib)
+	rm -f $(LIBDIR)/libecpg.a $(LIBDIR)/$(shlib)
 
 # Rules that do something
 libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 9dc093aa231..26a953edecf 100644
--- 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)\"
 
 all:: ecpg
 
@@ -15,10 +15,10 @@ clean:
 	rm -f *.o core a.out ecpg y.tab.h y.tab.c pgc.c *~
 
 install: all
-	$(INSTALL) $(INSTL_EXE_OPTS) ecpg $(DESTDIR)$(BINDIR)
+	$(INSTALL) $(INSTL_EXE_OPTS) ecpg $(BINDIR)
 
 uninstall:
-	rm -f $(DESTDIR)$(BINDIR)/ecpg
+	rm -f $(BINDIR)/ecpg
 
 # Rule that really do something.
 ecpg: y.tab.o pgc.o type.o ecpg.o ../lib/typename.o
diff --git a/src/interfaces/libpgtcl/Makefile.in b/src/interfaces/libpgtcl/Makefile.in
index 2703516f5b5..a5add6f9bfe 100644
--- a/src/interfaces/libpgtcl/Makefile.in
+++ b/src/interfaces/libpgtcl/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.6 1998/04/05 20:28:23 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpgtcl/Attic/Makefile.in,v 1.7 1998/04/05 22:02:29 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -94,12 +94,12 @@ beforeinstall-headers:
 	@if [ ! -d $(HEADERDIR) ]; then mkdir $(HEADERDIR); fi
 
 install-libpgtcl: libpgtcl.a
-	$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(DESTDIR)$(LIBDIR)/libpgtcl.a
+	$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(LIBDIR)/libpgtcl.a
 
 install-shlib: $(shlib)
 	$(INSTALL) $(INSTL_LIB_OPTS) $(shlib) \
-		$(DESTDIR)$(LIBDIR)/$(shlib)
-	ln -sf $(shlib) $(DESTDIR)$(LIBDIR)/libpgtcl.so
+		$(LIBDIR)/$(shlib)
+	ln -sf $(shlib) $(LIBDIR)/libpgtcl.so
 
 .PHONY: clean
 clean: 
diff --git a/src/interfaces/libpq++/Makefile b/src/interfaces/libpq++/Makefile
index 71670caf9ba..f83932630c0 100644
--- a/src/interfaces/libpq++/Makefile
+++ b/src/interfaces/libpq++/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.10 1998/03/20 04:07:11 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq++/Attic/Makefile,v 1.11 1998/04/05 22:02:41 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -99,15 +99,15 @@ beforeinstall-headers:
 	@if [ ! -d $(LIBPGXXHEADERDIR) ]; then mkdir $(LIBPGXXHEADERDIR); fi
 
 beforeinstall-lib:
-	@if [ ! -d $(DESTDIR)/$(LIBDIR) ] ; then mkdir $(DESTDIR)/$(LIBDIR); fi
+	@if [ ! -d $(LIBDIR) ] ; then mkdir $(LIBDIR); fi
 
 install-$(LIBNAME): $(LIBNAME).a beforeinstall-lib
-	$(INSTALL) $(INSTL_LIB_OPTS) $(LIBNAME).a $(DESTDIR)$(LIBDIR)/$(LIBNAME).a
+	$(INSTALL) $(INSTL_LIB_OPTS) $(LIBNAME).a $(LIBDIR)/$(LIBNAME).a
 
 install-shlib: $(SHLIBNAME) beforeinstall-lib
-	$(INSTALL) $(INSTL_SHLIB_OPTS) $(SHLIB) $(DESTDIR)/$(LIBDIR)/$(SHLIB)
-	rm -f $(DESTDIR)/$(LIBDIR)/libpq++.so
-	ln -sf $(SHLIB) $(DESTDIR)/$(LIBDIR)/libpq++.so
+	$(INSTALL) $(INSTL_SHLIB_OPTS) $(SHLIB) $(LIBDIR)/$(SHLIB)
+	rm -f $(LIBDIR)/libpq++.so
+	ln -sf $(SHLIB) $(LIBDIR)/libpq++.so
 
 
 doc:
diff --git a/src/interfaces/libpq/Makefile.in b/src/interfaces/libpq/Makefile.in
index d4261305e1c..aedcf95cf29 100644
--- a/src/interfaces/libpq/Makefile.in
+++ b/src/interfaces/libpq/Makefile.in
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.9 1998/03/20 04:07:02 momjian Exp $
+#    $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/Makefile.in,v 1.10 1998/04/05 22:02:33 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -170,12 +170,12 @@ beforeinstall-headers:
 		then mkdir $(HEADERDIR)/commands; fi
 
 install-libpq: libpq.a
-	$(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(DESTDIR)$(LIBDIR)/libpq.a
+	$(INSTALL) $(INSTL_LIB_OPTS) libpq.a $(LIBDIR)/libpq.a
 
 install-shlib: $(shlib)
-	$(INSTALL) $(INSTL_LIB_OPTS) $(shlib) $(DESTDIR)$(LIBDIR)/$(shlib)
-	rm -f $(DESTDIR)$(LIBDIR)/libpq.so
-	ln -s $(shlib) $(DESTDIR)$(LIBDIR)/libpq.so
+	$(INSTALL) $(INSTL_LIB_OPTS) $(shlib) $(LIBDIR)/$(shlib)
+	rm -f $(LIBDIR)/libpq.so
+	ln -s $(shlib) $(LIBDIR)/libpq.so
 
 depend dep:
 	$(CC) -MM *.c >depend