]> Savannah Git Hosting - gnulib.git/commitdiff
Make sure gperf-generated files are the same in VPATH builds.
authorBruno Haible <bruno@clisp.org>
Sat, 10 Aug 2024 10:48:55 +0000 (12:48 +0200)
committerBruno Haible <bruno@clisp.org>
Mon, 12 Aug 2024 17:18:09 +0000 (19:18 +0200)
Reported by Patrice Dumas <pertusus@free.fr> in
<https://lists.gnu.org/archive/html/bug-texinfo/2024-08/msg00030.html>.

* modules/iconv_open (Makefile.am): Eliminate directory names from the
generated iconv_open-aix.h, iconv_open-hpux.h, iconv_open-irix.h,
iconv_open-osf.h, iconv_open-solaris.h, iconv_open-zos.h.
* modules/unicase/locale-language (Makefile.am): Eliminate directory
names from the generated unicase/locale-languages.h.
* modules/unicase/special-casing (Makefile.am): Eliminate directory
names from the generated unicase/special-casing-table.h.
* modules/unictype/bidiclass-byname (Makefile.am): Eliminate directory
names from the generated unictype/bidi_byname.h.
* modules/unictype/category-byname (Makefile.am): Eliminate directory
names from the generated unictype/categ_byname.h.
* modules/unictype/combining-class-byname (Makefile.am): Eliminate
directory names from the generated unictype/combiningclass_byname.h.
* modules/unictype/joininggroup-byname (Makefile.am): Eliminate
directory names from the generated unictype/joininggroup_byname.h.
* modules/unictype/joiningtype-byname (Makefile.am): Eliminate directory
names from the generated unictype/joiningtype_byname.h.
* modules/unictype/property-byname (Makefile.am): Eliminate directory
names from the generated unictype/pr_byname.h.
* modules/unictype/scripts (Makefile.am): Eliminate directory names from
the generated unictype/scripts_byname.h.
* modules/uninorm/composition (Makefile.am): Eliminate directory names
from the generated uninorm/composition-table.h.

12 files changed:
ChangeLog
modules/iconv_open
modules/unicase/locale-language
modules/unicase/special-casing
modules/unictype/bidiclass-byname
modules/unictype/category-byname
modules/unictype/combining-class-byname
modules/unictype/joininggroup-byname
modules/unictype/joiningtype-byname
modules/unictype/property-byname
modules/unictype/scripts
modules/uninorm/composition

index 4ca2111a38154e96635888fb90209a227130f60f..5bacea148b811c062be09f4c228ebfbd01422584 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2024-08-10  Bruno Haible  <bruno@clisp.org>
+
+       Make sure gperf-generated files are the same in VPATH builds.
+       Reported by Patrice Dumas <pertusus@free.fr> in
+       <https://lists.gnu.org/archive/html/bug-texinfo/2024-08/msg00030.html>.
+       * modules/iconv_open (Makefile.am): Eliminate directory names from the
+       generated iconv_open-aix.h, iconv_open-hpux.h, iconv_open-irix.h,
+       iconv_open-osf.h, iconv_open-solaris.h, iconv_open-zos.h.
+       * modules/unicase/locale-language (Makefile.am): Eliminate directory
+       names from the generated unicase/locale-languages.h.
+       * modules/unicase/special-casing (Makefile.am): Eliminate directory
+       names from the generated unicase/special-casing-table.h.
+       * modules/unictype/bidiclass-byname (Makefile.am): Eliminate directory
+       names from the generated unictype/bidi_byname.h.
+       * modules/unictype/category-byname (Makefile.am): Eliminate directory
+       names from the generated unictype/categ_byname.h.
+       * modules/unictype/combining-class-byname (Makefile.am): Eliminate
+       directory names from the generated unictype/combiningclass_byname.h.
+       * modules/unictype/joininggroup-byname (Makefile.am): Eliminate
+       directory names from the generated unictype/joininggroup_byname.h.
+       * modules/unictype/joiningtype-byname (Makefile.am): Eliminate directory
+       names from the generated unictype/joiningtype_byname.h.
+       * modules/unictype/property-byname (Makefile.am): Eliminate directory
+       names from the generated unictype/pr_byname.h.
+       * modules/unictype/scripts (Makefile.am): Eliminate directory names from
+       the generated unictype/scripts_byname.h.
+       * modules/uninorm/composition (Makefile.am): Eliminate directory names
+       from the generated uninorm/composition-table.h.
+
 2024-08-09  Paul Eggert  <eggert@cs.ucla.edu>
 
        test-utime: port to noatime file systems
index 8aada83ef1ed147cc644db1472ecab789adebaee..95aaa47db7ccf0235207273e03c1bdaf996c06d7 100644 (file)
@@ -39,25 +39,48 @@ lib_SOURCES += iconv.c iconv_close.c
 endif
 
 $(srcdir)/iconv_open-aix.h: $(srcdir)/iconv_open-aix.gperf
-       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t && \
-       mv $(srcdir)/iconv_open-aix.h-t $(srcdir)/iconv_open-aix.h
+       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-aix.gperf > $(srcdir)/iconv_open-aix.h-t1 \
+       && sed -e 's|\([ "]\)[^ "]*/iconv_open-aix\.gperf\([ "]\)|\1iconv_open-aix.gperf\2|' \
+              < $(srcdir)/iconv_open-aix.h-t1 > $(srcdir)/iconv_open-aix.h-t2 \
+       && rm -f $(srcdir)/iconv_open-aix.h-t1 \
+       && mv $(srcdir)/iconv_open-aix.h-t2 $(srcdir)/iconv_open-aix.h
 $(srcdir)/iconv_open-hpux.h: $(srcdir)/iconv_open-hpux.gperf
-       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $(srcdir)/iconv_open-hpux.h-t && \
-       mv $(srcdir)/iconv_open-hpux.h-t $(srcdir)/iconv_open-hpux.h
+       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-hpux.gperf > $(srcdir)/iconv_open-hpux.h-t1 \
+       && sed -e 's|\([ "]\)[^ "]*/iconv_open-hpux\.gperf\([ "]\)|\1iconv_open-hpux.gperf\2|' \
+              < $(srcdir)/iconv_open-hpux.h-t1 > $(srcdir)/iconv_open-hpux.h-t2 \
+       && rm -f $(srcdir)/iconv_open-hpux.h-t1 \
+       && mv $(srcdir)/iconv_open-hpux.h-t2 $(srcdir)/iconv_open-hpux.h
 $(srcdir)/iconv_open-irix.h: $(srcdir)/iconv_open-irix.gperf
-       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t && \
-       mv $(srcdir)/iconv_open-irix.h-t $(srcdir)/iconv_open-irix.h
+       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-irix.gperf > $(srcdir)/iconv_open-irix.h-t1 \
+       && sed -e 's|\([ "]\)[^ "]*/iconv_open-irix\.gperf\([ "]\)|\1iconv_open-irix.gperf\2|' \
+              < $(srcdir)/iconv_open-irix.h-t1 > $(srcdir)/iconv_open-irix.h-t2 \
+       && rm -f $(srcdir)/iconv_open-irix.h-t1 \
+       && mv $(srcdir)/iconv_open-irix.h-t2 $(srcdir)/iconv_open-irix.h
 $(srcdir)/iconv_open-osf.h: $(srcdir)/iconv_open-osf.gperf
-       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $(srcdir)/iconv_open-osf.h-t && \
-       mv $(srcdir)/iconv_open-osf.h-t $(srcdir)/iconv_open-osf.h
+       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-osf.gperf > $(srcdir)/iconv_open-osf.h-t1 \
+       && sed -e 's|\([ "]\)[^ "]*/iconv_open-osf\.gperf\([ "]\)|\1iconv_open-osf.gperf\2|' \
+              < $(srcdir)/iconv_open-osf.h-t1 > $(srcdir)/iconv_open-osf.h-t2 \
+       && rm -f $(srcdir)/iconv_open-osf.h-t1 \
+       && mv $(srcdir)/iconv_open-osf.h-t2 $(srcdir)/iconv_open-osf.h
 $(srcdir)/iconv_open-solaris.h: $(srcdir)/iconv_open-solaris.gperf
-       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t && \
-       mv $(srcdir)/iconv_open-solaris.h-t $(srcdir)/iconv_open-solaris.h
+       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-solaris.gperf > $(srcdir)/iconv_open-solaris.h-t1 \
+       && sed -e 's|\([ "]\)[^ "]*/iconv_open-solaris\.gperf\([ "]\)|\1iconv_open-solaris.gperf\2|' \
+              < $(srcdir)/iconv_open-solaris.h-t1 > $(srcdir)/iconv_open-solaris.h-t2 \
+       && rm -f $(srcdir)/iconv_open-solaris.h-t1 \
+       && mv $(srcdir)/iconv_open-solaris.h-t2 $(srcdir)/iconv_open-solaris.h
 $(srcdir)/iconv_open-zos.h: $(srcdir)/iconv_open-zos.gperf
-       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-zos.gperf > $(srcdir)/iconv_open-zos.h-t && \
-       mv $(srcdir)/iconv_open-zos.h-t $(srcdir)/iconv_open-zos.h
+       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/iconv_open-zos.gperf > $(srcdir)/iconv_open-zos.h-t1 \
+       && sed -e 's|\([ "]\)[^ "]*/iconv_open-zos\.gperf\([ "]\)|\1iconv_open-zos.gperf\2|' \
+              < $(srcdir)/iconv_open-zos.h-t1 > $(srcdir)/iconv_open-zos.h-t2 \
+       && rm -f $(srcdir)/iconv_open-zos.h-t1 \
+       && mv $(srcdir)/iconv_open-zos.h-t2 $(srcdir)/iconv_open-zos.h
 BUILT_SOURCES        += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h iconv_open-zos.h
-MOSTLYCLEANFILES     += iconv_open-aix.h-t iconv_open-hpux.h-t iconv_open-irix.h-t iconv_open-osf.h-t iconv_open-solaris.h-t iconv_open-zos.h-t
+MOSTLYCLEANFILES     += iconv_open-aix.h-t1 iconv_open-aix.h-t2 \
+                        iconv_open-hpux.h-t1 iconv_open-hpux.h-t2 \
+                        iconv_open-irix.h-t1 iconv_open-irix.h-t2 \
+                        iconv_open-osf.h-t1 iconv_open-osf.h-t2 \
+                        iconv_open-solaris.h-t1 iconv_open-solaris.h-t2 \
+                        iconv_open-zos.h-t1 iconv_open-zos.h-t2
 MAINTAINERCLEANFILES += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h iconv_open-zos.h
 EXTRA_DIST           += iconv_open-aix.h iconv_open-hpux.h iconv_open-irix.h iconv_open-osf.h iconv_open-solaris.h iconv_open-zos.h
 
index 0fc35941439e4e77b2987685f7723658fbe29882..6255b96346b555f4dcbdf869cf5807479c09c22a 100644 (file)
@@ -20,7 +20,10 @@ endif
 
 $(srcdir)/unicase/locale-languages.h: $(srcdir)/unicase/locale-languages.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/locale-languages.gperf > $(srcdir)/unicase/locale-languages.h-t1 \
-       && sed -e 's/^const/static const/' < $(srcdir)/unicase/locale-languages.h-t1 > $(srcdir)/unicase/locale-languages.h-t2 \
+       && sed -e 's/^const/static const/' \
+              -e 's|\([ "]\)[^ "]*/unicase/locale-languages\.gperf\([ "]\)|\1unicase/locale-languages.gperf\2|' \
+              < $(srcdir)/unicase/locale-languages.h-t1 > $(srcdir)/unicase/locale-languages.h-t2 \
+       && rm -f $(srcdir)/unicase/locale-languages.h-t1 \
        && mv $(srcdir)/unicase/locale-languages.h-t2 $(srcdir)/unicase/locale-languages.h
 BUILT_SOURCES        += unicase/locale-languages.h
 MOSTLYCLEANFILES     += unicase/locale-languages.h-t1 unicase/locale-languages.h-t2
index 0a2bdbd23903ee5e1661f5a0ad5a1002f103e74f..1e491fd7e0cbaf307e17809d1c15e36809274774 100644 (file)
@@ -17,10 +17,13 @@ Makefile.am:
 lib_SOURCES += unicase/special-casing.c
 
 $(srcdir)/unicase/special-casing-table.h: $(srcdir)/unicase/special-casing-table.gperf
-       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/special-casing-table.gperf > $(srcdir)/unicase/special-casing-table.h-t && \
-       mv $(srcdir)/unicase/special-casing-table.h-t $(srcdir)/unicase/special-casing-table.h
+       $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unicase/special-casing-table.gperf > $(srcdir)/unicase/special-casing-table.h-t1 \
+       && sed -e 's|\([ "]\)[^ "]*/unicase/special-casing-table\.gperf\([ "]\)|\1unicase/special-casing-table.gperf\2|' \
+              < $(srcdir)/unicase/special-casing-table.h-t1 > $(srcdir)/unicase/special-casing-table.h-t2 \
+       && rm -f $(srcdir)/unicase/special-casing-table.h-t1 \
+       && mv $(srcdir)/unicase/special-casing-table.h-t2 $(srcdir)/unicase/special-casing-table.h
 BUILT_SOURCES        += unicase/special-casing-table.h
-MOSTLYCLEANFILES     += unicase/special-casing-table.h-t
+MOSTLYCLEANFILES     += unicase/special-casing-table.h-t1 unicase/special-casing-table.h-t2
 MAINTAINERCLEANFILES += unicase/special-casing-table.h
 EXTRA_DIST           += unicase/special-casing-table.h
 
index 8726128060f31fee3a1f4e7f8ad0cf5035f42add..ded6ad4a21a15b96cddd51e672bdba32831834de 100644 (file)
@@ -19,7 +19,10 @@ endif
 
 $(srcdir)/unictype/bidi_byname.h: $(srcdir)/unictype/bidi_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/bidi_byname.gperf > $(srcdir)/unictype/bidi_byname.h-t1 \
-       && sed -e 's/^const/static const/' < $(srcdir)/unictype/bidi_byname.h-t1 > $(srcdir)/unictype/bidi_byname.h-t2 \
+       && sed -e 's/^const/static const/' \
+              -e 's|\([ "]\)[^ "]*/unictype/bidi_byname\.gperf\([ "]\)|\1unictype/bidi_byname.gperf\2|' \
+              < $(srcdir)/unictype/bidi_byname.h-t1 > $(srcdir)/unictype/bidi_byname.h-t2 \
+       && rm -f $(srcdir)/unictype/bidi_byname.h-t1 \
        && mv $(srcdir)/unictype/bidi_byname.h-t2 $(srcdir)/unictype/bidi_byname.h
 BUILT_SOURCES        += unictype/bidi_byname.h
 MOSTLYCLEANFILES     += unictype/bidi_byname.h-t1 unictype/bidi_byname.h-t2
index 28eb1cb90ea9f11c44cbf4becad001da7b224d4a..8ec137390fc2099647a1838e4f3280ca77566a0f 100644 (file)
@@ -58,7 +58,10 @@ endif
 
 $(srcdir)/unictype/categ_byname.h: $(srcdir)/unictype/categ_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/categ_byname.gperf > $(srcdir)/unictype/categ_byname.h-t1 \
-       && sed -e 's/^const/static const/' < $(srcdir)/unictype/categ_byname.h-t1 > $(srcdir)/unictype/categ_byname.h-t2 \
+       && sed -e 's/^const/static const/' \
+              -e 's|\([ "]\)[^ "]*/unictype/categ_byname\.gperf\([ "]\)|\1unictype/categ_byname.gperf\2|' \
+              < $(srcdir)/unictype/categ_byname.h-t1 > $(srcdir)/unictype/categ_byname.h-t2 \
+       && rm -f $(srcdir)/unictype/categ_byname.h-t1 \
        && mv $(srcdir)/unictype/categ_byname.h-t2 $(srcdir)/unictype/categ_byname.h
 BUILT_SOURCES        += unictype/categ_byname.h
 MOSTLYCLEANFILES     += unictype/categ_byname.h-t1 unictype/categ_byname.h-t2
index b15b231d50535e3357f47b0eff1bf797527c9f67..d4af881892be8e5b5ef17bfce9fc4d46e96266b8 100644 (file)
@@ -19,7 +19,10 @@ endif
 
 $(srcdir)/unictype/combiningclass_byname.h: $(srcdir)/unictype/combiningclass_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/combiningclass_byname.gperf > $(srcdir)/unictype/combiningclass_byname.h-t1 \
-       && sed -e 's/^const/static const/' < $(srcdir)/unictype/combiningclass_byname.h-t1 > $(srcdir)/unictype/combiningclass_byname.h-t2 \
+       && sed -e 's/^const/static const/' \
+              -e 's|\([ "]\)[^ "]*/unictype/combiningclass_byname\.gperf\([ "]\)|\1unictype/combiningclass_byname.gperf\2|' \
+              < $(srcdir)/unictype/combiningclass_byname.h-t1 > $(srcdir)/unictype/combiningclass_byname.h-t2 \
+       && rm -f $(srcdir)/unictype/combiningclass_byname.h-t1 \
        && mv $(srcdir)/unictype/combiningclass_byname.h-t2 $(srcdir)/unictype/combiningclass_byname.h
 BUILT_SOURCES        += unictype/combiningclass_byname.h
 MOSTLYCLEANFILES     += unictype/combiningclass_byname.h-t1 unictype/combiningclass_byname.h-t2
index 9c01f1addaf80bda6cf9c7eb5387e61a9a42da57..bf8aeeec66d835aa956d665ffb9991b0b103470e 100644 (file)
@@ -19,7 +19,10 @@ endif
 
 $(srcdir)/unictype/joininggroup_byname.h: $(srcdir)/unictype/joininggroup_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/joininggroup_byname.gperf > $(srcdir)/unictype/joininggroup_byname.h-t1 \
-       && sed -e 's/^const/static const/' < $(srcdir)/unictype/joininggroup_byname.h-t1 > $(srcdir)/unictype/joininggroup_byname.h-t2 \
+       && sed -e 's/^const/static const/' \
+              -e 's|\([ "]\)[^ "]*/unictype/joininggroup_byname\.gperf\([ "]\)|\1unictype/joininggroup_byname.gperf\2|' \
+              < $(srcdir)/unictype/joininggroup_byname.h-t1 > $(srcdir)/unictype/joininggroup_byname.h-t2 \
+       && rm -f $(srcdir)/unictype/joininggroup_byname.h-t1 \
        && mv $(srcdir)/unictype/joininggroup_byname.h-t2 $(srcdir)/unictype/joininggroup_byname.h
 BUILT_SOURCES        += unictype/joininggroup_byname.h
 MOSTLYCLEANFILES     += unictype/joininggroup_byname.h-t1 unictype/joininggroup_byname.h-t2
index e6341777f1d5e3577eb87baad95f967618474bd8..8708006d4135024f3680b4d24eb3b31a756df873 100644 (file)
@@ -19,7 +19,10 @@ endif
 
 $(srcdir)/unictype/joiningtype_byname.h: $(srcdir)/unictype/joiningtype_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/joiningtype_byname.gperf > $(srcdir)/unictype/joiningtype_byname.h-t1 \
-       && sed -e 's/^const/static const/' < $(srcdir)/unictype/joiningtype_byname.h-t1 > $(srcdir)/unictype/joiningtype_byname.h-t2 \
+       && sed -e 's/^const/static const/' \
+              -e 's|\([ "]\)[^ "]*/unictype/joiningtype_byname\.gperf\([ "]\)|\1unictype/joiningtype_byname.gperf\2|' \
+              < $(srcdir)/unictype/joiningtype_byname.h-t1 > $(srcdir)/unictype/joiningtype_byname.h-t2 \
+       && rm -f $(srcdir)/unictype/joiningtype_byname.h-t1 \
        && mv $(srcdir)/unictype/joiningtype_byname.h-t2 $(srcdir)/unictype/joiningtype_byname.h
 BUILT_SOURCES        += unictype/joiningtype_byname.h
 MOSTLYCLEANFILES     += unictype/joiningtype_byname.h-t1 unictype/joiningtype_byname.h-t2
index 88297e9c64abcb6a58d95551098b153f4eb92f53..dd2e3838ec9973b66f11a4529f5d061443e05560 100644 (file)
@@ -106,7 +106,10 @@ endif
 
 $(srcdir)/unictype/pr_byname.h: $(srcdir)/unictype/pr_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/pr_byname.gperf > $(srcdir)/unictype/pr_byname.h-t1 \
-       && sed -e 's/^const/static const/' < $(srcdir)/unictype/pr_byname.h-t1 > $(srcdir)/unictype/pr_byname.h-t2 \
+       && sed -e 's/^const/static const/' \
+              -e 's|\([ "]\)[^ "]*/unictype/pr_byname\.gperf\([ "]\)|\1unictype/pr_byname.gperf\2|' \
+              < $(srcdir)/unictype/pr_byname.h-t1 > $(srcdir)/unictype/pr_byname.h-t2 \
+       && rm -f $(srcdir)/unictype/pr_byname.h-t1 \
        && mv $(srcdir)/unictype/pr_byname.h-t2 $(srcdir)/unictype/pr_byname.h
 BUILT_SOURCES        += unictype/pr_byname.h
 MOSTLYCLEANFILES     += unictype/pr_byname.h-t1 unictype/pr_byname.h-t2
index 9a7441bdb3d1bbd34a68423bfb2ba386ed59bf03..f5db4cd22d9a6d3b666a3edc4a7247d9ed2ebd88 100644 (file)
@@ -20,7 +20,10 @@ endif
 
 $(srcdir)/unictype/scripts_byname.h: $(srcdir)/unictype/scripts_byname.gperf
        $(V_GPERF)$(GPERF) -m 10 $(srcdir)/unictype/scripts_byname.gperf > $(srcdir)/unictype/scripts_byname.h-t1 \
-       && sed -e 's/^const/static const/' < $(srcdir)/unictype/scripts_byname.h-t1 > $(srcdir)/unictype/scripts_byname.h-t2 \
+       && sed -e 's/^const/static const/' \
+              -e 's|\([ "]\)[^ "]*/unictype/scripts_byname\.gperf\([ "]\)|\1unictype/scripts_byname.gperf\2|' \
+              < $(srcdir)/unictype/scripts_byname.h-t1 > $(srcdir)/unictype/scripts_byname.h-t2 \
+       && rm -f $(srcdir)/unictype/scripts_byname.h-t1 \
        && mv $(srcdir)/unictype/scripts_byname.h-t2 $(srcdir)/unictype/scripts_byname.h
 BUILT_SOURCES        += unictype/scripts_byname.h
 MOSTLYCLEANFILES     += unictype/scripts_byname.h-t1 unictype/scripts_byname.h-t2
index d17b7d70d56ebfee8d35ef5544fe61759b5c5832..44efa4feaeb421890480b807b8239b7aff88f955 100644 (file)
@@ -19,7 +19,10 @@ endif
 
 $(srcdir)/uninorm/composition-table.h: $(srcdir)/uninorm/composition-table.gperf
        $(V_GPERF)$(GPERF) -m 1 $(srcdir)/uninorm/composition-table.gperf > $(srcdir)/uninorm/composition-table.h-t1 \
-       && sed -e 's/^const/static const/' < $(srcdir)/uninorm/composition-table.h-t1 > $(srcdir)/uninorm/composition-table.h-t2 \
+       && sed -e 's/^const/static const/' \
+              -e 's|\([ "]\)[^ "]*/uninorm/composition-table\.gperf\([ "]\)|\1uninorm/composition-table.gperf\2|' \
+              < $(srcdir)/uninorm/composition-table.h-t1 > $(srcdir)/uninorm/composition-table.h-t2 \
+       && rm -f $(srcdir)/uninorm/composition-table.h-t1 \
        && mv $(srcdir)/uninorm/composition-table.h-t2 $(srcdir)/uninorm/composition-table.h
 BUILT_SOURCES        += uninorm/composition-table.h
 MOSTLYCLEANFILES     += uninorm/composition-table.h-t1 uninorm/composition-table.h-t2