diff options
| -rw-r--r-- | Config/funcinst.mk | 2 | ||||
| -rwxr-xr-x | Config/installfns.sh | 6 | ||||
| -rw-r--r-- | Doc/Makefile.in | 20 | ||||
| -rw-r--r-- | Src/Makefile.in | 2 | ||||
| -rw-r--r-- | Src/Makemod.in.in | 8 |
5 files changed, 18 insertions, 20 deletions
diff --git a/Config/funcinst.mk b/Config/funcinst.mk index 82f0c16a5..e473eb351 100644 --- a/Config/funcinst.mk +++ b/Config/funcinst.mk @@ -33,7 +33,6 @@ install.fns: FUNCTIONS_INSTALL="$(FUNCTIONS_INSTALL)" \ FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \ INSTALL_DATA="$(INSTALL_DATA)" \ - DESTDIR="$(DESTDIR)" \ $(SHELL) $(sdir_top)/Config/installfns.sh || exit 1; \ fi; \ exit 0 @@ -43,7 +42,6 @@ uninstall.fns: fndir="$(fndir)" sdir="$(sdir)" \ FUNCTIONS_INSTALL="$(FUNCTIONS_INSTALL)" \ FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \ - DESTDIR="$(DESTDIR)" \ $(SHELL) $(sdir_top)/Config/uninstallfns.sh || exit 1; \ fi; \ exit 0 diff --git a/Config/installfns.sh b/Config/installfns.sh index 2aa20bb32..de7a52bce 100755 --- a/Config/installfns.sh +++ b/Config/installfns.sh @@ -4,7 +4,7 @@ if test -d $fndir.old; then add_old=1 fi -$sdir_top/mkinstalldirs $DESTDIR$fndir || exit 1; +$sdir_top/mkinstalldirs $fndir || exit 1; # If the source directory is somewhere else, we need to force # the shell to expand it in that directory, then strip it off. @@ -36,8 +36,8 @@ for file in $install; do : ${add_old:=1} fi fi - $sdir_top/mkinstalldirs $DESTDIR$instdir || exit 1 - $INSTALL_DATA $sdir/$file $DESTDIR$instdir || exit 1 + $sdir_top/mkinstalldirs $instdir || exit 1 + $INSTALL_DATA $sdir/$file $instdir || exit 1 fi done diff --git a/Doc/Makefile.in b/Doc/Makefile.in index 6440a7da8..13d531c29 100644 --- a/Doc/Makefile.in +++ b/Doc/Makefile.in @@ -164,24 +164,24 @@ uninstall: uninstall.man # install man pages, creating install directory if necessary install.man: $(MAN) - $(sdir_top)/mkinstalldirs $(DESTDIR)$(mandir)/man1 + $(sdir_top)/mkinstalldirs $(mandir)/man1 for file in $(MAN); do \ if test -f $$file; then \ - $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)/man1; \ + $(INSTALL_DATA) $$file $(mandir)/man1; \ elif test -f $(sdir)/$$file; then \ - $(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(mandir)/man1; \ + $(INSTALL_DATA) $(sdir)/$$file $(mandir)/man1; \ else :; \ fi || exit 1; \ done # install info pages, creating install directory if necessary install.info: zsh.info - $(sdir_top)/mkinstalldirs $(DESTDIR)$(infodir) + $(sdir_top)/mkinstalldirs $(infodir) for file in zsh.info zsh.info-[1-9]*; do \ if test -f $$file; then \ - $(INSTALL_DATA) $$file $(DESTDIR)$(infodir); \ + $(INSTALL_DATA) $$file $(infodir); \ elif test -f $(sdir)/$$file; then \ - $(INSTALL_DATA) $(sdir)/$$file $(DESTDIR)$(infodir); \ + $(INSTALL_DATA) $(sdir)/$$file $(infodir); \ else :; \ fi || exit 1; \ done @@ -190,18 +190,18 @@ install.info: zsh.info else true; fi install.html: zsh_toc.html - $(sdir_top)/mkinstalldirs $(DESTDIR)$(htmldir) - $(INSTALL_DATA) *.html $(DESTDIR)$(htmldir) + $(sdir_top)/mkinstalldirs $(htmldir) + $(INSTALL_DATA) *.html $(htmldir) # uninstall man pages uninstall.man: for file in $(MAN); do \ - rm -f $(DESTDIR)$(mandir)/man1/$$file; \ + rm -f $(mandir)/man1/$$file; \ done # uninstall info pages uninstall.info: - rm -f $(DESTDIR)$(infodir)/zsh.info $(DESTDIR)$(infodir)/zsh.info-[1-9]* + rm -f $(infodir)/zsh.info $(infodir)/zsh.info-[1-9]* # ========== DEPENDENCIES FOR CLEANUP ========== diff --git a/Src/Makefile.in b/Src/Makefile.in index 99def0508..7ec130c2b 100644 --- a/Src/Makefile.in +++ b/Src/Makefile.in @@ -177,7 +177,7 @@ install.bin-L: $(LIBZSH) # uninstall binary uninstall.bin-here: uninstall.bin-@L@ - rm -f $(DESTDIR)$(bindir)/zsh-$(VERSION) $(bindir)/zsh + rm -f $(DESTDIR)$(bindir)/zsh-$(VERSION) $(DESTDIR)$(bindir)/zsh uninstall.bin-N: uninstall.bin-L: diff --git a/Src/Makemod.in.in b/Src/Makemod.in.in index 0ba2e217c..42cfc0401 100644 --- a/Src/Makemod.in.in +++ b/Src/Makemod.in.in @@ -127,15 +127,15 @@ install.bin-here uninstall.bin-here: install.modules-here: modules='$(MODULES)'; \ - if test -n "$$modules"; then $(sdir_top)/mkinstalldirs $(DESTDIR)$(MODDIR); fi; \ + if test -n "$$modules"; then $(sdir_top)/mkinstalldirs $(MODDIR); fi; \ for mod in $$modules; do \ - $(INSTALL_PROGRAM) $$mod $(DESTDIR)$(MODDIR)/$$mod; \ + $(INSTALL_PROGRAM) $$mod $(MODDIR)/$$mod; \ done uninstall.modules-here: modules='$(MODULES)'; for mod in $$modules; do \ - if test -f $(DESTDIR)$(MODDIR)/$$mod; then \ - rm -f $(DESTDIR)$(MODDIR)/$$mod; \ + if test -f $(MODDIR)/$$mod; then \ + rm -f $(MODDIR)/$$mod; \ else :; fi; \ done |