aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-05-16 17:01:22 -0700
committerGlenn Morris2010-05-16 17:01:22 -0700
commit7ca1f3f981dda5dbbab0095ab7c8e560eaaeaad8 (patch)
treea8021cea44072c0ae7626da0aa2e5df34a460fe2
parent7541dad5ce88b3f5a36a509b5e1988be37b7c13f (diff)
downloademacs-7ca1f3f981dda5dbbab0095ab7c8e560eaaeaad8.tar.gz
emacs-7ca1f3f981dda5dbbab0095ab7c8e560eaaeaad8.zip
* src/Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/Makefile.in3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 776dd6747f3..8c7bcad885b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
12010-05-16 Glenn Morris <rgm@gnu.org> 12010-05-16 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules.
4
3 * Makefile.in (clean): Get rid of HAVE_NS conditional. 5 * Makefile.in (clean): Get rid of HAVE_NS conditional.
4 6
5 * Makefile.in (ns_appdir, ns_appbindir): Now configure adds the 7 * Makefile.in (ns_appdir, ns_appbindir): Now configure adds the
diff --git a/src/Makefile.in b/src/Makefile.in
index 20c086c6229..5136ca4ca57 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -999,13 +999,14 @@ ${ns_appdir}: ${ns_appsrc}
999 rm -fr ${ns_appdir} 999 rm -fr ${ns_appdir}
1000 mkdir -p ${ns_appdir} 1000 mkdir -p ${ns_appdir}
1001 ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - ) 1001 ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - )
1002#endif /* HAVE_NS */
1002 1003
1004/* These are only used if HAVE_NS, but no harm in always defining them. */
1003${ns_appbindir}Emacs: emacs${EXEEXT} 1005${ns_appbindir}Emacs: emacs${EXEEXT}
1004 mkdir -p ${ns_appbindir} 1006 mkdir -p ${ns_appbindir}
1005 cp -f emacs${EXEEXT} ${ns_appbindir}Emacs 1007 cp -f emacs${EXEEXT} ${ns_appbindir}Emacs
1006 1008
1007ns-app: ${ns_appdir} ${ns_appbindir}Emacs 1009ns-app: ${ns_appdir} ${ns_appbindir}Emacs
1008#endif /* HAVE_NS */
1009 1010
1010mostlyclean: 1011mostlyclean:
1011 rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a 1012 rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a