From: Glenn Morris <rgm@gnu.org>
Date: Thu, 18 Mar 2010 06:33:39 +0000 (-0700)
Subject: * Makefile.in (dot): Remove, since ../ is used throughout the other Makefiles.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~724
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c1d052860fcc483352b84b779af94b0bd1d3e033;p=emacs.git

* Makefile.in (dot): Remove, since ../ is used throughout the other Makefiles.
---

diff --git a/leim/ChangeLog b/leim/ChangeLog
index a7de27cc2c6..513201c4a78 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-18  Glenn Morris  <rgm@gnu.org>
+
+	* Makefile.in (dot): Remove, since ../ is used throughout the
+	other Makefiles.
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* 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
 
 GZIP_PROG = @GZIP_PROG@
 
-# On IBM RS6000, double-dot gets screwed up.
-dot = .
-
 # Which Emacs to use to convert TIT files to Emacs Lisp files,
 # byte-compile Emacs Lisp files, and generate the file leim-list.el.
-BUILT-EMACS = ${dot}${dot}/src/emacs
+BUILT-EMACS = ../src/emacs
 
-buildlisppath=${srcdir}/${dot}${dot}/lisp
+buildlisppath=${srcdir}/../lisp
 
 # How to run Emacs.
 RUN-EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
@@ -161,7 +158,7 @@ all: ${BUILT-EMACS} ${SUBDIRS} leim-list.el ${WORLD}
 
 # To ensure that we can run Emacs.  This target is ignored (never
 # being hit) if a user changes default value of EMACS.
-${dot}${dot}/src/emacs:
+../src/emacs:
 	cd ../src; ${MAKE} ${MFLAGS} emacs
 
 ${SUBDIRS}:
@@ -224,7 +221,7 @@ MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
 
 install: all
 	if [ ! -d ${INSTALLDIR} ] ; then \
-          umask 022; ${srcdir}/${dot}${dot}/mkinstalldirs ${INSTALLDIR}; \
+          umask 022; ${srcdir}/../mkinstalldirs ${INSTALLDIR}; \
 	else true; fi
 	if [ x`(cd ${INSTALLDIR} && /bin/pwd)` != x`(/bin/pwd)` ] ; then \
 	  rm -f ${INSTALLDIR}/leim-list.el; \