Minor NS build fixes.

* Makefile.in (install-arch-dep): Update odd NS rule for Emacs version.

* src/Makefile.in (${ns_appdir}): Simplify using umask.

diff --git a/ChangeLog b/ChangeLog
index fabf7b2f3abe595ef1c593be5ced7eeeab91b496..1b52a3784f850627ba5731a1cd38f34024ec473e 100644 (file)
--- 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 245ec6cc8e6f036d0d4f208de8ea6f05ad471654..d21a9e569769cfee91f84a42b27c79a6c1cb9c1b 100644 (file)
--- 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 ec0b9eeb178865457ed00b2db16e2ce66566ae14..ff0dbddd6418be03e507bcaf1100785c1ce57891 100644 (file)
--- 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 3925938c70bb3300fc5d42964722e619f0e1d7ae..e4f7f07521c487e59f4aa932209db00fd82c4f01 100644 (file)
--- 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}