Bring macuvs.h back under Git control

* admin/unidata/Makefile.in (maintainer-clean):
Instead of removing macuvs.h here ...
(extraclean): ... Remove it here.
* admin/unidata/uvs.el (uvs-print-table-ivd):
Add to comment explaining why macuvs.h is in Git.
* src/macuvs.h: Regenerate and re-add to Git.

2 files changed, 14 insertions, 5 deletions

diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index e50b01bded2..8d439dcb7ce 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -112,11 +112,12 @@ distclean: clean
         rm -f Makefile
 
 maintainer-clean: distclean
-        rm -f ${top_srcdir}/src/macuvs.h
 
 ## Do not remove these files, even in a bootstrap, because they rarely
 ## change and it slows down bootstrap (a tiny bit).
 ## Cf leim/ja-dic (which is much slower).
-extraclean: maintainer-clean
-        rm -f ${unidir}/charscript.el*
+## Also, removing macuvs.h would mean that macOS builds would need
+## to do a headless bootstrap, which is currently awkward.
+extraclean: distclean
+        rm -f ${top_srcdir}/src/macuvs.h ${unidir}/charscript.el*
         rm -f ${unifiles} ${unidir}/charprop.el
diff --git a/admin/unidata/uvs.el b/admin/unidata/uvs.el
index ad2b6548a23..dfea4796528 100644
--- a/admin/unidata/uvs.el
+++ b/admin/unidata/uvs.el
@@ -201,8 +201,16 @@ corresponding number."
            (uvs-alist-from-ivd collection-id
                                sequence-id-to-glyph-func))))
     (set-binary-mode 'stdout t)
-    (princ "/* This file was automatically generated from admin/unidata/IVD_Sequences.txt\n")
-    (princ "   by the script admin/unidata/uvs.el  */\n")
+    (princ "\
+/* This file was automatically generated from admin/unidata/IVD_Sequences.txt
+   by the script admin/unidata/uvs.el.  It is version-controlled
+   because otherwise the first build on macOS from the source
+   repository would need to be headless.
+
+   FIXME: Make it convenient to do headless bootstrap builds on macOS,
+   so that this file need not be put into the source repository.  */
+
+")
     (princ
      (format "static const unsigned char mac_uvs_table_%s_bytes[] =\n  {\n"
              (replace-regexp-in-string "[^_[:alnum:]]" "_"