Mercurial > emacs
changeset 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 | 877bec632371 |
| files | ChangeLog Makefile.in src/ChangeLog src/Makefile.in |
| diffstat | 4 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri May 14 17:42:22 2010 -0700 +++ b/ChangeLog Fri May 14 17:48:53 2010 -0700 @@ -1,5 +1,7 @@ 2010-05-15 Glenn Morris <rgm@gnu.org> + * Makefile.in (install-arch-dep): Update odd NS rule for Emacs version. + * Makefile.in (install-arch-indep): Remove references to RCS, CVS, and other files that no longer exist.
--- a/Makefile.in Fri May 14 17:42:22 2010 -0700 +++ b/Makefile.in Fri May 14 17:48:53 2010 -0700 @@ -425,10 +425,15 @@ rm -fr share ) ; \ ( cd ${ns_appbindir}/libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \ rm -fr emacs ) ; \ - ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-23* ; \ + ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-24* ; \ ln -sf ../libexec/* .) ; \ else true ; fi +## FIXME is the emacs-24* bit above really necessary and correct? +## What if I have 24.1 and 24.2 installed at the same time? +## In any case, it should use something like echo $version | sed 's/\..*//' +## instead of hard-coding a version. + ## 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} \
--- a/src/ChangeLog Fri May 14 17:42:22 2010 -0700 +++ b/src/ChangeLog Fri May 14 17:48:53 2010 -0700 @@ -1,5 +1,7 @@ 2010-05-15 Glenn Morris <rgm@gnu.org> + * Makefile.in (${ns_appdir}): Simplify using umask. + * Makefile.in (${ns_appdir}): Remove references to CVS-related files. 2010-05-14 Stefan Monnier <monnier@iro.umontreal.ca>
--- a/src/Makefile.in Fri May 14 17:42:22 2010 -0700 +++ b/src/Makefile.in Fri May 14 17:48:53 2010 -0700 @@ -972,9 +972,7 @@ ${ns_appdir}: ${ns_appsrc} rm -fr ${ns_appdir} mkdir -p ${ns_appdir} - ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; tar xf - ) - ( cd ${ns_appdir} ; for subdir in `find . -type d -print` ; do \ - chmod a+rx $${subdir} ; done ; ) + ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - ) ${ns_appbindir}Emacs: emacs${EXEEXT} mkdir -p ${ns_appbindir}