[Emacs-diffs] /srv/bzr/emacs/trunk r108263: Further simplify install-arch-dep for self-contained NS builds

[Glenn Morris]

------------------------------------------------------------
revno: 108263
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-05-17 14:28:24 -0400
message:
  Further simplify install-arch-dep for self-contained NS builds
  
  * Makefile.in (install-arch-dep): Use $write_subdir.
modified:
  ChangeLog
  Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-05-17 18:26:51 +0000
+++ b/ChangeLog 2012-05-17 18:28:24 +0000
@@ -1,7 +1,7 @@
 2012-05-17  Glenn Morris  <address@hidden>
 
        * Makefile.in (write_subdir): New.
-       (install-arch-indep): Use $write_subdir.
+       (install-arch-indep, install-arch-dep): Use $write_subdir.
 
        * configure.in (docdir, etcdir, infodir, lispdir):
        For a self-contained ns build, set these to the appropriate values.

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-05-17 18:26:51 +0000
+++ b/Makefile.in       2012-05-17 18:28:24 +0000
@@ -473,15 +473,18 @@
          rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
          ln $(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)${bindir}/$(EMACS) || 
true ; \
        else \
-         ( cd ${ns_appresdir} || exit 1 ; \
-           if test -d share/emacs ; then \
-             for dir in share/emacs/${version}/*; do \
-               rm -fr `basename "$$dir"`; mv "$$dir" . ; \
-             done ; \
-           fi ; \
-           rm -fr share ) ; \
+         subdir=${ns_appresdir}/site-lisp; \
+         ${MKDIR_P} $${subdir}; \
+         ${write_subdir} || exit 1; \
+         rm -rf ${ns_appresdir}/share; \
        fi
 
+## In the share directory, we are deleting:
+## applications (with emacs.desktop)
+## emacs (basically empty)
+## icons (duplicates etc/images/icons/hicolor)
+## man   (maybe we should be installing this one, like info)
+
 ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
 ## Needs to be the user running install, so configure can't set it.
 set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \