emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108182: Simply leim install rule


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108182: Simply leim install rule for ns case
Date: Fri, 02 Nov 2012 02:32:35 -0000
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 108182
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-05-09 19:46:58 -0700
message:
  Simply leim install rule for ns case
  
  * leim/Makefile.in (MV_DIRS): Remove.
  (install): Simplify the --with-ns case.
modified:
  leim/ChangeLog
  leim/Makefile.in
=== modified file 'leim/ChangeLog'
--- a/leim/ChangeLog    2012-04-09 20:37:08 +0000
+++ b/leim/ChangeLog    2012-05-10 02:46:58 +0000
@@ -1,3 +1,8 @@
+2012-05-10  Glenn Morris  <address@hidden>
+
+       * Makefile.in (MV_DIRS): Remove.
+       (install): Simplify the --with-ns case.
+
 2012-04-09  Glenn Morris  <address@hidden>
 
        * 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.
 

=== modified file 'leim/Makefile.in'
--- a/leim/Makefile.in  2012-04-09 20:37:08 +0000
+++ b/leim/Makefile.in  2012-05-10 02:46:58 +0000
@@ -35,6 +35,7 @@
 address@hidden@
 
 # 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 @@
          $(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 @@
        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:


reply via email to

[Prev in Thread] Current Thread [Next in Thread]