comparison Makefile.in @ 108579:ab7ad4459a75

Minor NS build fixes. * Makefile.in (install-arch-dep): Update odd NS rule for Emacs version. * src/Makefile.in (${ns_appdir}): Simplify using umask.
author Glenn Morris <rgm@gnu.org>
date Fri, 14 May 2010 17:48:53 -0700
parents 438f784b2966
children cb966dd854bc
comparison
equal deleted inserted replaced
108578:438f784b2966 108579:ab7ad4459a75
423 if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ 423 if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\
424 if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ 424 if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \
425 rm -fr share ) ; \ 425 rm -fr share ) ; \
426 ( cd ${ns_appbindir}/libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \ 426 ( cd ${ns_appbindir}/libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \
427 rm -fr emacs ) ; \ 427 rm -fr emacs ) ; \
428 ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-23* ; \ 428 ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-24* ; \
429 ln -sf ../libexec/* .) ; \ 429 ln -sf ../libexec/* .) ; \
430 else true ; fi 430 else true ; fi
431
432 ## FIXME is the emacs-24* bit above really necessary and correct?
433 ## What if I have 24.1 and 24.2 installed at the same time?
434 ## In any case, it should use something like echo $version | sed 's/\..*//'
435 ## instead of hard-coding a version.
431 436
432 ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html 437 ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
433 ## Needs to be the user running install, so configure can't set it. 438 ## Needs to be the user running install, so configure can't set it.
434 set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \ 439 set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
435 `id -un 2> /dev/null`; do \ 440 `id -un 2> /dev/null`; do \