diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-05-09 19:46:58 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-05-09 19:46:58 -0700 |
| commit | 234d8d6682c1903a2180a7ad4ae17bb5e45468e2 (patch) | |
| tree | f422017de0bc8839185fe3608adeddf524d5c913 /leim | |
| parent | ec8145a2d90c2c59af0b33a8f295aea620e4fd7f (diff) | |
| download | emacs-234d8d6682c1903a2180a7ad4ae17bb5e45468e2.tar.gz | |
Simply leim install rule for ns case
* leim/Makefile.in (MV_DIRS): Remove.
(install): Simplify the --with-ns case.
Diffstat (limited to 'leim')
| -rw-r--r-- | leim/ChangeLog | 7 | ||||
| -rw-r--r-- | leim/Makefile.in | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index 07e26cf766b..49d5b8c0b9a 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,8 @@ +2012-05-10 Glenn Morris <rgm@gnu.org> + + * Makefile.in (MV_DIRS): Remove. + (install): Simplify the --with-ns case. + 2012-04-09 Glenn Morris <rgm@gnu.org> * Makefile.in (EMACS): Rename from BUILT_EMACS. @@ -2289,7 +2294,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 1997-1999, 2001-2012 Free Software Foundation, Inc. + Copyright (C) 1997-1999, 2001-2012 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/leim/Makefile.in b/leim/Makefile.in index 21561a357d1..1b1cd3fbcfd 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -35,6 +35,7 @@ srcdir=@srcdir@ ns_appresdir=@ns_appresdir@ # Where to install LEIM files. +# Should be $ns_appresdir/leim if $ns_appresdir is set. INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim GZIP_PROG = @GZIP_PROG@ @@ -174,8 +175,6 @@ compile-main: ${TIT_MISC} $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ done -MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done - install: all if [ ! -d ${INSTALLDIR} ] ; then \ umask 022; ${srcdir}/../build-aux/install-sh -d ${INSTALLDIR}; \ @@ -216,9 +215,9 @@ install: all done ; \ find ${INSTALLDIR} -exec chown $${installuser} '{}' ';' if [ "${ns_appresdir}" != "" ]; then \ - ( cd ${ns_appresdir} ; \ - if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ - rm -fr share ) ; \ + rm -rf ${ns_appresdir}/leim; \ + mv ${INSTALLDIR} ${ns_appresdir} || exit 1; \ + rmdir -p ${ns_appresdir}/share/emacs/${version} 2>/dev/null || true; \ else true ; fi clean mostlyclean: |