mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-11 16:08:13 +00:00
Code Issues Releases Activity

Simply leim install rule for ns case

Browse Source 
* leim/Makefile.in (MV_DIRS): Remove.
(install): Simplify the --with-ns case.
This commit is contained in:
Glenn Morris 2012-05-09 19:46:58 -07:00
parent ec8145a2d9
commit 234d8d6682
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
leim/ChangeLog
View File

@ -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> 2012-04-09 Glenn Morris <rgm@gnu.org>
* Makefile.in (EMACS): Rename from BUILT_EMACS. * Makefile.in (EMACS): Rename from BUILT_EMACS.
@ -2289,7 +2294,7 @@
;; coding: utf-8 ;; coding: utf-8
;; End: ;; 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. This file is part of GNU Emacs.

9
leim/Makefile.in
View File

@ -35,6 +35,7 @@ srcdir=@srcdir@
ns_appresdir=@ns_appresdir@ ns_appresdir=@ns_appresdir@
# Where to install LEIM files. # Where to install LEIM files.
# Should be $ns_appresdir/leim if $ns_appresdir is set.
INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim INSTALLDIR=$(DESTDIR)${datadir}/emacs/${version}/leim
GZIP_PROG = @GZIP_PROG@ GZIP_PROG = @GZIP_PROG@
@ -174,8 +175,6 @@ compile-main: ${TIT_MISC}
$(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \ $(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
done done
MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done
install: all install: all
if [ ! -d ${INSTALLDIR} ] ; then \ if [ ! -d ${INSTALLDIR} ] ; then \
umask 022; ${srcdir}/../build-aux/install-sh -d ${INSTALLDIR}; \ umask 022; ${srcdir}/../build-aux/install-sh -d ${INSTALLDIR}; \
@ -216,9 +215,9 @@ install: all
done ; \ done ; \
find ${INSTALLDIR} -exec chown $${installuser} '{}' ';' find ${INSTALLDIR} -exec chown $${installuser} '{}' ';'
if [ "${ns_appresdir}" != "" ]; then \ if [ "${ns_appresdir}" != "" ]; then \
( cd ${ns_appresdir} ; \ rm -rf ${ns_appresdir}/leim; \
if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ mv ${INSTALLDIR} ${ns_appresdir} || exit 1; \
rm -fr share ) ; \ rmdir -p ${ns_appresdir}/share/emacs/${version} 2>/dev/null || true; \
else true ; fi else true ; fi
clean mostlyclean: clean mostlyclean: