diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2008-12-30 20:13:28 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2008-12-30 20:13:28 +0000 |
| commit | 9c2224013b406a4889b4af6e6445acfa89fe67db (patch) | |
| tree | c4c02f8faf378d7d9a0885f02489d6dd0687d694 /Makefile.in | |
| parent | ba952214229c1ce4170b5cb125397c988f67d99f (diff) | |
| download | emacs-9c2224013b406a4889b4af6e6445acfa89fe67db.tar.gz | |
(install-arch-dep): Remove old directories in
ns_app* before moving new directories there.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 9d26595eed3..8425867ef29 100644 --- a/Makefile.in +++ b/Makefile.in @@ -393,6 +393,8 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) install: all install-arch-indep install-arch-dep install-leim blessmail @true +MV_DIRS = for i in $$dir; do rm -fr $$(basename "$$i") ; mv "$$i" . ; done + ### Install the executables that were compiled specifically for this machine. ### It would be nice to do something for a parallel make ### to ensure that install-arch-indep finishes before this starts. @@ -414,10 +416,11 @@ install-arch-dep: mkdir done if test "${ns_appdir}" != ""; then \ ( cd ${ns_appresdir} ; \ - if test -d share/emacs ; then mv -f share/emacs/*/* . ; fi ; \ - if test -d share/info ; then mv -f share/info . ; fi ; \ + if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ + if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ rm -fr share ) ; \ - ( cd ${ns_appbindir}/libexec ; mv -f emacs/*/*/* . ; rm -fr emacs ) ; \ + ( cd ${ns_appbindir}/libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \ + rm -fr emacs ) ; \ ( cd ${ns_appbindir}/bin ; rm -f emacs emacs-23* ; \ ln -sf ../libexec/* .) ; \ else true ; fi |