--- make.tmpl.in.old	2006-09-03 14:38:36.000000000 -0400
+++ make.tmpl.in	2006-09-03 14:37:43.000000000 -0400
@@ -21,21 +21,21 @@
 SOFLAG += @SOFLAG@
 
 # Setup directory variables
-prefix = $(DESTDIR)@prefix@
-exec_prefix = $(DESTDIR)@exec_prefix@
-bindir = @bindir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = $(DESTDIR)@bindir@
 ifeq ("@KLIBC@", "no")
-  libdir = @libdir@
-  sbindir = @sbindir@
-  includedir = @includedir@
-  infodir = @infodir@
-  mandir = @mandir@
+  libdir = $(DESTDIR)@libdir@
+  sbindir = $(DESTDIR)@sbindir@
+  includedir = $(DESTDIR)@includedir@
+  infodir = $(DESTDIR)@infodir@
+  mandir = $(DESTDIR)@mandir@
 else
   libdir = $(DESTDIR)@KLIBC_LIB_DIR@
   sbindir = $(DESTDIR)@KLIBC_SBIN_DIR@
   includedir = $(DESTDIR)@KLIBC_INCLUDE_DIR@
-  infodir = @infodir@
-  mandir = @mandir@
+  infodir = $(DESTDIR)@infodir@
+  mandir = $(DESTDIR)@mandir@
 endif