diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-05-14 17:48:53 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-05-14 17:48:53 -0700 |
| commit | 2b5f541b4f67c7978cf124012593c7ceaeab6292 (patch) | |
| tree | 52e8250a2ff12fcf3171e58793dd4da9a661c3de | |
| parent | 02be533b2a5020338453da4957d30dde4ed2c6fb (diff) | |
| download | emacs-2b5f541b4f67c7978cf124012593c7ceaeab6292.tar.gz | |
Minor NS build fixes.
* Makefile.in (install-arch-dep): Update odd NS rule for Emacs version.
* src/Makefile.in (${ns_appdir}): Simplify using umask.
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Makefile.in | 7 | ||||
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index fabf7b2f3ab..1b52a3784f8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/Makefile.in b/Makefile.in index 245ec6cc8e6..d21a9e56976 100644 --- a/Makefile.in +++ b/Makefile.in @@ -425,10 +425,15 @@ install-arch-dep: mkdir 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} \ diff --git a/src/ChangeLog b/src/ChangeLog index ec0b9eeb178..ff0dbddd641 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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> diff --git a/src/Makefile.in b/src/Makefile.in index 3925938c70b..e4f7f07521c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -972,9 +972,7 @@ textprop.o: textprop.c buffer.h window.h $(INTERVALS_H) \ ${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} |