* configure.in (mandir): May as well include it in the NS app bundle.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3b66db4..69757d5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -488,6 +488,10 @@ install-arch-dep: install-arch-indep
 ## icons (duplicates etc/images/icons/hicolor)
 ## man   (maybe we should be installing this one, like info)
 
+## This is install-etc for everything except self-contained-ns builds.
+## For them, it is empty.
+INSTALL_ARCH_INDEP_EXTRA = @INSTALL_ARCH_INDEP_EXTRA@
+
 ## 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} \
@@ -530,7 +534,7 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
 ## Is it really Emacs's job to create those directories?
 ## Should we also be ensuring they contain subdirs.el files?
 ## It would be easy to do, just use write_subdir.
-install-arch-indep: info install-etc install-leim
+install-arch-indep: info install-leim ${INSTALL_ARCH_INDEP_EXTRA}
        umask 022 ; \
          $(MKDIR_P) $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
        -set ${COPYDESTS} ; \
@@ -570,6 +574,7 @@ install-arch-indep: info install-etc install-leim
        subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \
          ${write_subdir} || true
        -unset CDPATH; \
+       umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
        if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
        then \
           fullversion=`./src/emacs --version | sed -n '1 s/GNU Emacs *//p'`; \
@@ -580,7 +585,6 @@ install-arch-indep: info install-etc install-leim
             docfile="DOC"; \
           fi; \
           echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \
-          umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
           ${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${docdir}/$${docfile}; \
           (cd $(DESTDIR)$(docdir); \
            $(set_installuser); \