From: Glenn Morris Date: Mon, 17 May 2010 00:01:22 +0000 (-0700) Subject: * src/Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~208^2~19 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7ca1f3f981dda5dbbab0095ab7c8e560eaaeaad8;p=emacs.git * src/Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules. --- diff --git a/src/ChangeLog b/src/ChangeLog index 776dd6747f3..8c7bcad885b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-05-16 Glenn Morris + * Makefile.in (${ns_appbindir}Emacs, ns-app): Always define these rules. + * Makefile.in (clean): Get rid of HAVE_NS conditional. * 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} rm -fr ${ns_appdir} mkdir -p ${ns_appdir} ( cd ${ns_appsrc} ; tar cfh - . ) | ( cd ${ns_appdir} ; umask 022; tar xf - ) +#endif /* HAVE_NS */ +/* These are only used if HAVE_NS, but no harm in always defining them. */ ${ns_appbindir}Emacs: emacs${EXEEXT} mkdir -p ${ns_appbindir} cp -f emacs${EXEEXT} ${ns_appbindir}Emacs ns-app: ${ns_appdir} ${ns_appbindir}Emacs -#endif /* HAVE_NS */ mostlyclean: rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a