include paths for gperf-generated headers in unictype

[Ralf Wildenhues]

Hello Bruno, all,

with current git, a `gnulib-tool --with-tests --test' fails like this
if built in a VPATH build:

make[3]: Entering directory `/tmp/build/gllib'
depbase=`echo unictype/pr_byname.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        gcc -std=gnu99 -DHAVE_CONFIG_H -DEXEEXT=\"\" -DEXEEXT=\"\" -DNO_XMALLOC 
-DEXEEXT=\"\" -I. -I../../gllib -I..  -I../intl   -g -O2 -MT 
unictype/pr_byname.o -MD -MP -MF $depbase.Tpo -c -o unictype/pr_byname.o 
../../gllib/unictype/pr_byname.c &&\
        mv -f $depbase.Tpo $depbase.Po
../../gllib/unictype/pr_byname.c:26:23: error: pr_byname.h: No such file or 
directory

make[3]: Entering directory `/tmp/build/gllib'
depbase=`echo unictype/scripts.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
        gcc -std=gnu99 -DHAVE_CONFIG_H -DEXEEXT=\"\" -DEXEEXT=\"\" -DNO_XMALLOC 
-DEXEEXT=\"\" -I. -I../../gllib -I..  -I../intl   -g -O2 -MT unictype/scripts.o 
-MD -MP -MF $depbase.Tpo -c -o unictype/scripts.o 
../../gllib/unictype/scripts.c &&\
        mv -f $depbase.Tpo $depbase.Po
../../gllib/unictype/scripts.c:26:28: error: scripts_byname.h: No such file or 
directory

The gperf-generated headers end up in the build tree, but the include
paths added to not extend to the $(srcdir)/unictype subdirectory.

OK to apply this patch to fix it?  Or would you rather add more include
paths?

Cheers,
Ralf

        * lib/unictype/pr_byname.c: Use prefixed include for pr_byname.h.
        * lib/unictype/scripts.c: Likewise, for scripts_byname.h.

diff --git a/lib/unictype/pr_byname.c b/lib/unictype/pr_byname.c
index fae5043..cb6e553 100644
--- a/lib/unictype/pr_byname.c
+++ b/lib/unictype/pr_byname.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 /* Get gperf generated lookup function.  */
-#include "pr_byname.h"
+#include "unictype/pr_byname.h"
 
 static const uc_property_t UC_PROPERTY_NONE = { NULL };
 
diff --git a/lib/unictype/scripts.c b/lib/unictype/scripts.c
index 64edfe8..092009d 100644
--- a/lib/unictype/scripts.c
+++ b/lib/unictype/scripts.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include "scripts.h"
-#include "scripts_byname.h"
+#include "unictype/scripts_byname.h"
 
 const uc_script_t *
 uc_script (ucs4_t uc)