From: Rob Browning <rlb@defaultvalue.org>
Date: Wed, 22 Oct 2014 00:10:17 +0000 (-0500)
Subject: Don't try to build src/macuvs.h (via IVD_Sequences.txt)
X-Git-Tag: archive/raspbian/1%26.1+1-3+rpi1~1^2^2^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f112cd4267a739ff5165000f4901bc48d3fc7eb3;p=emacs.git

Don't try to build src/macuvs.h (via IVD_Sequences.txt)

These are OS X specific, and were removed for now, due to uncertainty
over the licensing.

Gbp-Pq: Name 0006-Don-t-try-to-build-src-macuvs.h-via-IVD_Sequences.tx.patch
---

diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index f58303b6d76..408a4cd5a0d 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -53,16 +53,7 @@ am__v_at_1 =
 
 .PHONY: all unifiles
 
-all: ${top_srcdir}/src/macuvs.h unifiles ${unidir}/charscript.el
-
-## Specify .elc as an order-only prereq so as to not needlessly rebuild
-## target just because the .elc is missing.
-## Same with charprop.el below.
-${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \
-  ${srcdir}/uvs.elc
-	$(AM_V_GEN)${emacs} -L ${srcdir} -l uvs \
-	  --eval '(uvs-print-table-ivd (unmsys--file-name "${srcdir}/IVD_Sequences.txt") "Adobe-Japan1")' \
-	  > $@
+all: unifiles ${unidir}/charscript.el
 
 %.elc: %.el
 	$(AM_V_ELC)${emacs} -f batch-byte-compile $<
@@ -122,7 +113,7 @@ maintainer-clean: distclean
 ## change and it slows down bootstrap (a tiny bit).
 ## Cf leim/ja-dic (which is much slower).
 extraclean:
-	rm -f ${top_srcdir}/src/macuvs.h ${unidir}/charscript.el*
+	rm -f ${unidir}/charscript.el*
   ifneq (,$(wildcard $(unidir)/charprop.el))
 	cd $(unidir) && \
 	  rm -f `sed -n 's/^;; FILE: //p' < charprop.el` charprop.el