From 78cf457b60ed515376ed6f668077be13c5036f10 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Tue, 17 Jul 2007 15:22:30 +0200
Subject: [PATCH] Unified installation of includes.

---
 build/install-includes | 2 +-
 charset/Makefile       | 3 +--
 images/Makefile        | 3 +--
 lib/Makefile           | 4 +---
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/build/install-includes b/build/install-includes
index 1bf32483..33e2c9a9 100755
--- a/build/install-includes
+++ b/build/install-includes
@@ -8,7 +8,7 @@ DEST=$2
 shift 2
 while [ -n "$1" ] ; do
 	if [ "$SRC/$1" -nt "$DEST/$1" ] ; then
-		echo "Copying $SRC/$1 to $DEST/$1"
+		echo "INC $SRC/$1 -> $DEST/$1"
 		mkdir -p $DEST/`dirname $1`
 		cp $SRC/$1 $DEST/$1
 	fi
diff --git a/charset/Makefile b/charset/Makefile
index dc8f4681..4f3f45b4 100644
--- a/charset/Makefile
+++ b/charset/Makefile
@@ -10,8 +10,7 @@ $(o)/charset/libcharset.so: $(addsuffix .oo,$(addprefix $(o)/charset/,$(LIBCHARS
 
 INCLUDES+=$(o)/charset/.include-stamp
 $(o)/charset/.include-stamp: $(addprefix $(s)/charset/,$(LIBCHARSET_INCLUDES))
-	$(s)/build/install-includes $(s)/charset run/include/charset $(?F)
-	touch $(o)/charset/.include-stamp
+$(o)/charset/.include-stamp: IDST=charset
 
 build_charsets:
 	cd $(s)/charset && sh misc/generate
diff --git a/images/Makefile b/images/Makefile
index c089123a..31155edf 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -85,5 +85,4 @@ $(o)/images/color.test: $(o)/images/color-t
 
 INCLUDES+=$(o)/images/.include-stamp
 $(o)/images/.include-stamp: $(addprefix $(s)/images/,$(LIBIMAGES_INCLUDES))
-	$(s)/build/install-includes $(s)/images run/include/images $(?F)
-	touch $(o)/images/.include-stamp
+$(o)/images/.include-stamp: IDST=images
diff --git a/lib/Makefile b/lib/Makefile
index 08fe41b2..98260600 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -114,9 +114,7 @@ $(o)/lib/getopt.test: $(o)/lib/getopt-t
 
 INCLUDES+=$(o)/lib/.include-stamp
 $(o)/lib/.include-stamp: $(addprefix $(s)/lib/,$(LIBUCW_INCLUDES))
-	$(s)/build/install-includes $(s)/lib run/include/lib $(?F)
-	$(s)/build/install-includes $(o)/lib run/include/lib autoconf.h
-	touch $(o)/lib/.include-stamp
+$(o)/lib/.include-stamp: IDST=lib
 
 ifdef CONFIG_UCW_PERL
 include $(s)/lib/perl/Makefile
-- 
2.39.2