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

diff --git a/ChangeLog b/ChangeLog
index 1719958dfa2637e9e502ed4cbfd17ee6c0aacd2c..1b3895fe05789d06b89b9a4e7c3633d0265fbe0b 100644 (file)
--- 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 4caf9a06cb7bc02275ba794c2b54ec549da08482..e1068dabe2f9d17955084e6dab27e6651375c7fa 100644 (file)
--- 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 b7970c2d31d84237aa2b7f34a5d409e998bcc49c..53540285579602a09e7bf2b5c3d62dcb691a28df 100644 (file)
--- 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 49faaef2bba04a78012581ea84f4e63c449eea13..43f56a9b75f1b3487631a39394d7489935aa15ef 100644 (file)
--- 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 fe5d600ee1cc0c858d110bb231b870842b31c7e7..eb5e7a6684f0704a1cc1f058f171065c676e7f95 100644 (file)
--- 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 54e93e954758198b344e1707200be8ca60e28219..290d3e390dbeb32dc6eb8c9e20fdf2f05e8f67b0 100644 (file)
--- 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 fb8a5d508af644053b3e09af73a8bda02c71b9f4..135cd3776b0ba5be2200b598323464a425567cbd 100644 (file)
--- 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