diff options
| author | Glenn Morris | 2011-11-21 20:56:49 -0500 |
|---|---|---|
| committer | Glenn Morris | 2011-11-21 20:56:49 -0500 |
| commit | 60bf278fd3a039979ad4bd0bc3423798a055e9f5 (patch) | |
| tree | 7ef10d58072d9b74df1ec1ddf0b7509e2e7d2ce2 | |
| parent | 816be9f6298874bd26a61c28a97be74ff2298d8d (diff) | |
| download | emacs-60bf278fd3a039979ad4bd0bc3423798a055e9f5.tar.gz emacs-60bf278fd3a039979ad4bd0bc3423798a055e9f5.zip | |
* Makefile.in (install-arch-dep): Tweak previous change.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 6 |
2 files changed, 7 insertions, 3 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-11-22 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * Makefile.in (install-arch-dep): Tweak previous change. | ||
| 4 | |||
| 1 | 2011-11-22 Yavor Doganov <yavor@gnu.org> | 5 | 2011-11-22 Yavor Doganov <yavor@gnu.org> |
| 2 | 6 | ||
| 3 | Do not install arch-dependent files in the app bundle if | 7 | Do not install arch-dependent files in the app bundle if |
diff --git a/Makefile.in b/Makefile.in index 1e86f5f0176..c0d108877c1 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -475,9 +475,9 @@ install-arch-dep: mkdir | |||
| 475 | if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ | 475 | if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ |
| 476 | rm -fr share ) ; \ | 476 | rm -fr share ) ; \ |
| 477 | ( cd ${ns_appbindir} ; \ | 477 | ( cd ${ns_appbindir} ; \ |
| 478 | if test -d libexec; then cd libexec ; dir=emacs/*/*/* ; \ | 478 | if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \ |
| 479 | $(MV_DIRS); rm -fr emacs; \ | 479 | rm -fr emacs; if cd ../bin; then rm -f emacs emacs-24*; \ |
| 480 | cd ../bin; rm -f emacs emacs-24*; ln -sf ../libexec/* . ; fi ) ; \ | 480 | ln -sf ../libexec/* . ; fi ; fi ) ; \ |
| 481 | else true ; fi | 481 | else true ; fi |
| 482 | 482 | ||
| 483 | ## FIXME is the emacs-24* bit above really necessary and correct? | 483 | ## FIXME is the emacs-24* bit above really necessary and correct? |