From 639c84c1934aa56608b0159457d02f007ba5b1bd Mon Sep 17 00:00:00 2001
From: Alasdair Kergon <agk@redhat.com>
Date: Wed, 17 Mar 2004 19:37:44 +0000
Subject: [PATCH] Fix DESTDIR with configure path overrides.

---
 make.tmpl.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/make.tmpl.in b/make.tmpl.in
index d6a984b9c..a58c085aa 100644
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -31,14 +31,14 @@ LIBS = @LIBS@
 CFLAGS += @CFLAGS@
 
 # Setup directory variables
-prefix = $(DESTDIR)@prefix@
-exec_prefix = $(DESTDIR)@exec_prefix@
-bindir = @bindir@
-libdir = @libdir@
-sbindir = @sbindir@
-infodir = @infodir@
-mandir = @mandir@
-localedir = @LOCALEDIR@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = $(DESTDIR)@bindir@
+libdir = $(DESTDIR)@libdir@
+sbindir = $(DESTDIR)@sbindir@
+infodir = $(DESTDIR)@infodir@
+mandir = $(DESTDIR)@mandir@
+localedir = $(DESTDIR)@LOCALEDIR@
 
 # setup misc variables
 # define the ownership variables for the binaries and man pages