From b628c5f8252afadd7344543f70f7a2edbef57bda Mon Sep 17 00:00:00 2001
From: Alexey Gladkov <legion@altlinux.org>
Date: Thu, 21 Feb 2008 13:56:51 +0300
Subject: [PATCH] Fix DESTDIR handling

Signed-off-by: Alexey Gladkov <legion@altlinux.org>
---
 CHANGES          | 6 ++++--
 data/Makefile.in | 4 ++--
 man/Makefile.in  | 4 ++--
 po/Makefile.in   | 6 +++---
 src/Makefile.in  | 2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGES b/CHANGES
index f316489..eb9c301 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,10 +1,12 @@
 Changes for 1.14.1 (legion)
 
 o Build system:
-  - Add Norwegian dvorak keymap.
-  - Add turkish F (trf) keyboard map.
   - Fix computing of the host-system type.
   - Fix options handling (thanks for the help to Mike Frysinger).
+  - Fix DESTDIR handling.
+o Keymaps:
+  - Add Norwegian dvorak keymap.
+  - Add turkish F (trf) keyboard map.
 
 Changes for 1.14 (legion)
 
diff --git a/data/Makefile.in b/data/Makefile.in
index daa91be..5b68707 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -1,6 +1,6 @@
-prefix  = @prefix@
+prefix      = @prefix@
 datarootdir = @datarootdir@
-datadir = @datadir@
+datadir     = $(DESTDIR)@datadir@
 
 # If you change the names of any of the following subdirs,
 # also change paths.h.
diff --git a/man/Makefile.in b/man/Makefile.in
index d2593b5..39e6fa1 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,7 +1,7 @@
 prefix         = @prefix@
 datarootdir    = @datarootdir@
-datadir        = @datadir@
-mandir         = @mandir@
+datadir        = $(DESTDIR)@datadir@
+mandir         = $(DESTDIR)@mandir@
 OPTIONAL_PROGS = @OPTIONAL_PROGS@
 
 # Generated files
diff --git a/po/Makefile.in b/po/Makefile.in
index 54dbbf5..d4761ed 100644
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -3,9 +3,9 @@ PACKAGE_NAME  = @PACKAGE_NAME@
 prefix        = @prefix@
 datarootdir   = @datarootdir@
 datadir       = @datadir@
-localedir     = $(datadir)/locale
-gnulocaledir  = $(datadir)/locale
-gettextsrcdir = $(datadir)/gettext/po
+localedir     = $(DESTDIR)$(datadir)/locale
+gnulocaledir  = $(DESTDIR)$(datadir)/locale
+gettextsrcdir = $(DESTDIR)$(datadir)/gettext/po
 
 FOREIGN       = @FOREIGN@
 HAVE_XGETTEXT = @HAVE_XGETTEXT@
diff --git a/src/Makefile.in b/src/Makefile.in
index f016c8d..3f83416 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,6 @@
 prefix         = @prefix@
 exec_prefix    = @exec_prefix@
-bindir         = @bindir@
+bindir         = $(DESTDIR)@bindir@
 datarootdir    = @datarootdir@
 OPTIONAL_PROGS = @OPTIONAL_PROGS@
 
-- 
2.7.4