From 5571633133c6f600d4126a083819d3ae5804f1c0 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Mon, 6 Oct 2014 22:14:28 -0700
Subject: [PATCH] admin/unidata/Makefile.in small cleanup

* admin/unidata/Makefile.in (unidir): Rename from DSTDIR.  Change all uses.
(charprop.el, install): Remove rules.
(clean): Simplify.
---
 admin/ChangeLog           |  6 ++++++
 admin/unidata/Makefile.in | 32 ++++++++++----------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ad4422ec3e1..224ed5e6149 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-07  Glenn Morris  <rgm@gnu.org>
+
+	* unidata/Makefile.in (unidir): Rename from DSTDIR.  Change all uses.
+	(charprop.el, install): Remove rules.
+	(clean): Simplify.
+
 2014-10-04  Glenn Morris  <rgm@gnu.org>
 
 	* authors.el (authors-renamed-files-alist): Add package-x-test.el
diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index 6b253ea565b..f1b8ba2bd13 100644
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -28,12 +28,12 @@ top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 
 EMACS = ${top_builddir}/src/emacs
-DSTDIR = ${top_srcdir}/lisp/international
+unidir = ${top_srcdir}/lisp/international
 emacs = "${EMACS}" -batch --no-site-file --no-site-lisp
 
-.PHONY: all compile install
+.PHONY: all
 
-all: ${top_srcdir}/src/macuvs.h ${DSTDIR}/charprop.el
+all: ${top_srcdir}/src/macuvs.h ${unidir}/charprop.el
 
 ## Specify .elc as an order-only prereq so as to not needlessly rebuild
 ## target just because the .elc is missing.
@@ -50,30 +50,18 @@ ${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \
 unidata.txt: ${srcdir}/UnicodeData.txt
 	sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < $< > $@
 
-${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt | \
+${unidir}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt | \
   ${srcdir}/unidata-gen.elc unidata.txt
 	-if [ -f "$@" ]; then \
-	  cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \
+	  cd ${unidir} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \
 	fi
 	${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \
-	  ${srcdir} "${DSTDIR}"
-
-## Like the above, but generate in PWD rather than lisp/international.
-charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
-	${emacs} -L ${srcdir} -l unidata-gen -f unidata-gen-files \
-	  ${srcdir}
+	  ${srcdir} "${unidir}"
 
 .PHONY: clean bootstrap-clean distclean maintainer-clean extraclean
 
-install: charprop.el
-	cp charprop.el ${DSTDIR}
-	cp `sed -n 's/^;; FILE: //p' < charprop.el` ${DSTDIR}
-
 clean:
-	if test -f charprop.el; then \
-	  rm -f `sed -n 's/^;; FILE: //p' < charprop.el`; \
-	fi
-	rm -f charprop.el ${srcdir}/*.elc unidata.txt
+	rm -f ${srcdir}/*.elc unidata.txt
 
 bootstrap-clean: clean
 
@@ -87,7 +75,7 @@ maintainer-clean: distclean
 ## Cf leim/ja-dic (which is much slower).
 extraclean:
 	rm -f ${top_srcdir}/src/macuvs.h
-	if test -f ${DSTDIR}/charprop.el; then \
-	  (cd ${DSTDIR} && rm -f `sed -n 's/^;; FILE: //p' < charprop.el`); \
-	  rm -f ${DSTDIR}/charprop.el; \
+	if test -f ${unidir}/charprop.el; then \
+	  (cd ${unidir} && rm -f `sed -n 's/^;; FILE: //p' < charprop.el`); \
+	  rm -f ${unidir}/charprop.el; \
 	fi
-- 
2.39.5