From: Bruno Haible <bruno@clisp.org>
Date: Fri, 1 May 2009 21:36:40 +0000 (+0200)
Subject: Make it possible for the first build to be a VPATH build.
X-Git-Tag: v0.1~5959
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=54a5f5f9d0b00b3285f4b1fe75ce627ef824031a;p=gnulib.git

Make it possible for the first build to be a VPATH build.
---

diff --git a/ChangeLog b/ChangeLog
index 1719958df..1b3895fe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2009-05-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+            Bruno Haible  <bruno@clisp.org>
+
+	Make it possible for the first build to be a VPATH build.
+	* modules/unicase/locale-language (configure.ac): Invoke
+	AC_PROG_MKDIR_P.
+	(Makefile.am): When invoking gperf, ensure the destination file's
+	subdirectory exists also in the build tree.
+	* modules/unicase/special-casing (configure.ac): Invoke
+	AC_PROG_MKDIR_P.
+	(Makefile.am): When invoking gperf, ensure the destination file's
+	subdirectory exists also in the build tree.
+	* modules/unictype/property-byname (configure.ac): Invoke
+	AC_PROG_MKDIR_P.
+	(Makefile.am): When invoking gperf, ensure the destination file's
+	subdirectory exists also in the build tree.
+	* modules/unictype/scripts (configure.ac): Invoke AC_PROG_MKDIR_P.
+	(Makefile.am): When invoking gperf, ensure the destination file's
+	subdirectory exists also in the build tree.
+	* modules/uninorm/composition (configure.ac): Invoke AC_PROG_MKDIR_P.
+	(Makefile.am): When invoking gperf, ensure the destination file's
+	subdirectory exists also in the build tree.
+	* lib/uninorm/composition.c: Include "uninorm/composition-table.h", not
+	"composition-table.h".
+
 2009-05-01  Bruno Haible  <bruno@clisp.org>
 
 	* lib/wchar.in.h (wcsnrtombs): Define if REPLACE_WCSNRTOMBS is 1.
diff --git a/lib/uninorm/composition.c b/lib/uninorm/composition.c
index 4caf9a06c..e1068dabe 100644
--- a/lib/uninorm/composition.c
+++ b/lib/uninorm/composition.c
@@ -24,7 +24,7 @@
 
 struct composition_rule { char codes[4]; unsigned short combined; };
 
-#include "composition-table.h"
+#include "uninorm/composition-table.h"
 
 ucs4_t
 uc_composition (ucs4_t uc1, ucs4_t uc2)
diff --git a/modules/unicase/locale-language b/modules/unicase/locale-language
index b7970c2d3..535402855 100644
--- a/modules/unicase/locale-language
+++ b/modules/unicase/locale-language
@@ -11,11 +11,13 @@ localename
 gperf
 
 configure.ac:
+AC_PROG_MKDIR_P
 
 Makefile.am:
 lib_SOURCES += unicase/locale-language.c
 
 unicase/locale-languages.h: $(srcdir)/unicase/locale-languages.gperf
+	@MKDIR_P@ unicase
 	$(GPERF) -m 10 $(srcdir)/unicase/locale-languages.gperf > $@-t
 	mv $@-t $@
 BUILT_SOURCES        += unicase/locale-languages.h
diff --git a/modules/unicase/special-casing b/modules/unicase/special-casing
index 49faaef2b..43f56a9b7 100644
--- a/modules/unicase/special-casing
+++ b/modules/unicase/special-casing
@@ -10,11 +10,13 @@ Depends-on:
 gperf
 
 configure.ac:
+AC_PROG_MKDIR_P
 
 Makefile.am:
 lib_SOURCES += unicase/special-casing.c
 
 unicase/special-casing-table.h: $(srcdir)/unicase/special-casing-table.gperf
+	@MKDIR_P@ unicase
 	$(GPERF) -m 10 $(srcdir)/unicase/special-casing-table.gperf > $@-t
 	mv $@-t $@
 BUILT_SOURCES        += unicase/special-casing-table.h
diff --git a/modules/unictype/property-byname b/modules/unictype/property-byname
index fe5d600ee..eb5e7a668 100644
--- a/modules/unictype/property-byname
+++ b/modules/unictype/property-byname
@@ -89,11 +89,13 @@ unictype/property-zero-width
 gperf
 
 configure.ac:
+AC_PROG_MKDIR_P
 
 Makefile.am:
 lib_SOURCES += unictype/pr_byname.c
 
 unictype/pr_byname.h: unictype/pr_byname.gperf
+	@MKDIR_P@ unictype
 	$(GPERF) -m 10 $(srcdir)/unictype/pr_byname.gperf > $@-t
 	mv $@-t $@
 BUILT_SOURCES        += unictype/pr_byname.h
diff --git a/modules/unictype/scripts b/modules/unictype/scripts
index 54e93e954..290d3e390 100644
--- a/modules/unictype/scripts
+++ b/modules/unictype/scripts
@@ -11,11 +11,13 @@ unictype/base
 gperf
 
 configure.ac:
+AC_PROG_MKDIR_P
 
 Makefile.am:
 lib_SOURCES += unictype/scripts.c
 
 unictype/scripts_byname.h: unictype/scripts_byname.gperf
+	@MKDIR_P@ unictype
 	$(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > $@-t
 	mv $@-t $@
 BUILT_SOURCES        += unictype/scripts_byname.h
diff --git a/modules/uninorm/composition b/modules/uninorm/composition
index fb8a5d508..135cd3776 100644
--- a/modules/uninorm/composition
+++ b/modules/uninorm/composition
@@ -10,11 +10,13 @@ uninorm/base
 gperf
 
 configure.ac:
+AC_PROG_MKDIR_P
 
 Makefile.am:
 lib_SOURCES += uninorm/composition.c
 
 uninorm/composition-table.h: $(srcdir)/uninorm/composition-table.gperf
+	@MKDIR_P@ uninorm
 	$(GPERF) -m 1 $(srcdir)/uninorm/composition-table.gperf > $@-t
 	mv $@-t $@
 BUILT_SOURCES        += uninorm/composition-table.h