[Emacs-diffs] trunk r114856: * admin/unidata/Makefile.in (abs_srcdir): New, set by configure.

[Glenn Morris]

------------------------------------------------------------
revno: 114856
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2013-10-29 23:24:16 -0700
message:
  * admin/unidata/Makefile.in (abs_srcdir): New, set by configure.
  (${DSTDIR}/charprop.el, charprop.el): Update for srcdir not absolute.
  (clean): Delete all .elc files.
modified:
  admin/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-2226
  admin/unidata/Makefile.in      
makefile.in-20091113204419-o5vbwnq5f7feedwu-8551

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2013-10-23 06:22:54 +0000
+++ b/admin/ChangeLog   2013-10-30 06:24:16 +0000
@@ -1,3 +1,9 @@
+2013-10-30  Glenn Morris  <address@hidden>
+
+       * unidata/Makefile.in (abs_srcdir): New, set by configure.
+       (${DSTDIR}/charprop.el, charprop.el): Update for srcdir not absolute.
+       (clean): Delete all .elc files.
+
 2013-10-23  Glenn Morris  <address@hidden>
 
        * unidata/Makefile.in (emacs, ${DSTDIR}/charprop.el):

=== modified file 'admin/unidata/Makefile.in'
--- a/admin/unidata/Makefile.in 2013-10-23 06:22:54 +0000
+++ b/admin/unidata/Makefile.in 2013-10-30 06:24:16 +0000
@@ -24,6 +24,7 @@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
+abs_srcdir = @abs_srcdir@
 abs_builddir = @abs_builddir@
 top_srcdir = @top_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -41,13 +42,13 @@
        sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < 
${srcdir}/UnicodeData.txt > $@
 
 ${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
-       cd ${DSTDIR} && ${emacs} -l ${srcdir}/unidata-gen \
-         -f unidata-gen-files ${srcdir} "${abs_builddir}/unidata.txt"
+       cd ${DSTDIR} && ${emacs} -l ${abs_srcdir}/unidata-gen \
+         -f unidata-gen-files ${abs_srcdir} "${abs_builddir}/unidata.txt"
 
 ## Like the above, but generate in PWD rather than lisp/international.
 charprop.el: ${srcdir}/unidata-gen.elc unidata.txt
-       ${emacs} -l ${srcdir}/unidata-gen \
-         -f unidata-gen-files ${srcdir} unidata.txt
+       ${emacs} -L ${srcdir} -l unidata-gen \
+         -f unidata-gen-files ${srcdir} "${abs_builddir}/unidata.txt"
 
 install: charprop.el
        cp charprop.el ${DSTDIR}
@@ -57,7 +58,7 @@
        if test -f charprop.el; then \
          rm -f `sed -n 's/^;; FILE: //p' < charprop.el`; \
        fi
-       rm -f charprop.el ${srcdir}/unidata-gen.elc unidata.txt
+       rm -f charprop.el ${srcdir}/*.elc unidata.txt
 
 distclean: clean
        -rm -f ./Makefile