diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makefile.in | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index b1aed06bbbc..0c921934881 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2012-05-15 Glenn Morris <rgm@gnu.org> - * Makefile.in (install-arch-dep): Replace use of MV_DIRS with info. + * Makefile.in (install-arch-dep): Replace use of MV_DIRS with info, + and with libexec. * Makefile.in (install-arch-dep): Do not hard-code version number. diff --git a/Makefile.in b/Makefile.in index 5237076b776..0b1fb77e6db 100644 --- a/Makefile.in +++ b/Makefile.in @@ -473,9 +473,9 @@ install-arch-dep: mkdir if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ if test -d share/info ; then rm -fr info; mv share/info . ; fi ; \ rm -fr share ) ; \ - ( cd ${ns_appbindir} ; \ - if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \ - rm -fr emacs; rm -f ../bin/emacs ../bin/$(EMACSFULL) ; \ + ( if cd ${ns_appbindir}/libexec ; then \ + mv -f emacs/${version}/${configuration}/* . ; rm -fr emacs ; \ + rm -f ../bin/emacs ../bin/$(EMACSFULL) ; \ fi ) ; \ else true ; fi |