Undo 2009-05-01 patch.

diff --git a/ChangeLog b/ChangeLog
index 3ac13ad..81b3a25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,31 +95,6 @@
        install-exec-local.  Likewise, rename the uninstall-local rule to
        uninstall-localcharset, and make it a prerequisite of the former.
 
-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 e1068da..4caf9a0 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 "uninorm/composition-table.h"
+#include "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 5354028..b7970c2 100644 (file)
--- a/modules/unicase/locale-language
+++ b/modules/unicase/locale-language
@@ -11,13 +11,11 @@ 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 43f56a9..49faaef 100644 (file)
--- a/modules/unicase/special-casing
+++ b/modules/unicase/special-casing
@@ -10,13 +10,11 @@ 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 eb5e7a6..fe5d600 100644 (file)
--- a/modules/unictype/property-byname
+++ b/modules/unictype/property-byname
@@ -89,13 +89,11 @@ 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 290d3e3..54e93e9 100644 (file)
--- a/modules/unictype/scripts
+++ b/modules/unictype/scripts
@@ -11,13 +11,11 @@ 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 135cd37..fb8a5d5 100644 (file)
--- a/modules/uninorm/composition
+++ b/modules/uninorm/composition
@@ -10,13 +10,11 @@ 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