aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-03-17 23:33:39 -0700
committerGlenn Morris2010-03-17 23:33:39 -0700
commitc1d052860fcc483352b84b779af94b0bd1d3e033 (patch)
treea9739e2dc66e3e4a096766ed15f4558a1371dd04
parent1728474534760876c186d5be643ba25dd92a15b6 (diff)
downloademacs-c1d052860fcc483352b84b779af94b0bd1d3e033.tar.gz
emacs-c1d052860fcc483352b84b779af94b0bd1d3e033.zip
* Makefile.in (dot): Remove, since ../ is used throughout the other Makefiles.
-rw-r--r--leim/ChangeLog5
-rw-r--r--leim/Makefile.in11
2 files changed, 9 insertions, 7 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog
index a7de27cc2c6..513201c4a78 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
12010-03-18 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (dot): Remove, since ../ is used throughout the
4 other Makefiles.
5
12010-03-10 Chong Yidong <cyd@stupidchicken.com> 62010-03-10 Chong Yidong <cyd@stupidchicken.com>
2 7
3 * Branch for 23.2. 8 * Branch for 23.2.
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 244063bb2c4..bd67f373af1 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -40,14 +40,11 @@ INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim
40 40
41GZIP_PROG = @GZIP_PROG@ 41GZIP_PROG = @GZIP_PROG@
42 42
43# On IBM RS6000, double-dot gets screwed up.
44dot = .
45
46# Which Emacs to use to convert TIT files to Emacs Lisp files, 43# Which Emacs to use to convert TIT files to Emacs Lisp files,
47# byte-compile Emacs Lisp files, and generate the file leim-list.el. 44# byte-compile Emacs Lisp files, and generate the file leim-list.el.
48BUILT-EMACS = ${dot}${dot}/src/emacs 45BUILT-EMACS = ../src/emacs
49 46
50buildlisppath=${srcdir}/${dot}${dot}/lisp 47buildlisppath=${srcdir}/../lisp
51 48
52# How to run Emacs. 49# How to run Emacs.
53RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \ 50RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
@@ -161,7 +158,7 @@ all: ${BUILT-EMACS} ${SUBDIRS} leim-list.el ${WORLD}
161 158
162# To ensure that we can run Emacs. This target is ignored (never 159# To ensure that we can run Emacs. This target is ignored (never
163# being hit) if a user changes default value of EMACS. 160# being hit) if a user changes default value of EMACS.
164${dot}${dot}/src/emacs: 161../src/emacs:
165 cd ../src; ${MAKE} ${MFLAGS} emacs 162 cd ../src; ${MAKE} ${MFLAGS} emacs
166 163
167${SUBDIRS}: 164${SUBDIRS}:
@@ -224,7 +221,7 @@ MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
224 221
225install: all 222install: all
226 if [ ! -d ${INSTALLDIR} ] ; then \ 223 if [ ! -d ${INSTALLDIR} ] ; then \
227 umask 022; ${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \ 224 umask 022; ${srcdir}/../mkinstalldirs ${INSTALLDIR}; \
228 else true; fi 225 else true; fi
229 if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \ 226 if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
230 rm -f ${INSTALLDIR}/leim-list.el; \ 227 rm -f ${INSTALLDIR}/leim-list.el; \