[Emacs-diffs] trunk r118068: admin/unidata/Makefile.in small cleanup

[Glenn Morris]

------------------------------------------------------------
revno: 118068
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2014-10-06 22:14:28 -0700
message:
  admin/unidata/Makefile.in small cleanup
  
  * admin/unidata/Makefile.in (unidir): Rename from DSTDIR.  Change all uses.
  (charprop.el, install): Remove rules.
  (clean): Simplify.
modified:
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/unidata/Makefile.in      
makefile.in-20091113204419-o5vbwnq5f7feedwu-8551

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2014-10-04 19:07:05 +0000
+++ b/admin/ChangeLog   2014-10-07 05:14:28 +0000
@@ -1,3 +1,9 @@
+2014-10-07  Glenn Morris  <address@hidden>
+
+       * unidata/Makefile.in (unidir): Rename from DSTDIR.  Change all uses.
+       (charprop.el, install): Remove rules.
+       (clean): Simplify.
+
 2014-10-04  Glenn Morris  <address@hidden>
 
        * authors.el (authors-renamed-files-alist): Add package-x-test.el

=== modified file 'admin/unidata/Makefile.in'
--- a/admin/unidata/Makefile.in 2014-06-25 06:03:13 +0000
+++ b/admin/unidata/Makefile.in 2014-10-07 05:14:28 +0000
@@ -28,12 +28,12 @@
 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 @@
 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 @@
 ## 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