| 8c5ba9ce |
1 | diff -Nru bash-2.05/Makefile.in bash-2.05.new/Makefile.in |
| 2 | --- bash-2.05/Makefile.in Thu Apr 19 03:00:07 2001 |
| 3 | +++ bash-2.05.new/Makefile.in Thu Apr 19 03:03:43 2001 |
| 4 | @@ -593,14 +593,15 @@ |
| 5 | # Targets that actually do things not part of the build |
| 6 | |
| 7 | installdirs: |
| 8 | - @${SHELL} $(SUPPORT_SRC)mkdirs $(bindir) |
| 9 | - @${SHELL} $(SUPPORT_SRC)mkdirs $(man1dir) $(man3dir) |
| 10 | - @${SHELL} $(SUPPORT_SRC)mkdirs $(infodir) |
| 11 | + @${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(bindir) |
| 12 | + @${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(man1dir) $(DESTDIR)$(man3dir) |
| 13 | + @${SHELL} $(SUPPORT_SRC)mkdirs $(DESTDIR)$(infodir) |
| 14 | |
| 15 | install: .made installdirs |
| 16 | - $(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(bindir)/$(Program) |
| 17 | - $(INSTALL_PROGRAM) $(INSTALLMODE2) bashbug $(bindir)/bashbug |
| 18 | + $(INSTALL_PROGRAM) $(INSTALLMODE) $(Program) $(DESTDIR)$(bindir)/$(Program) |
| 19 | + $(INSTALL_PROGRAM) $(INSTALLMODE2) bashbug $(DESTDIR)$(bindir)/bashbug |
| 20 | -( cd $(DOCDIR) ; $(MAKE) $(MFLAGS) \ |
| 21 | + DESTDIR=$(DESTDIR) \ |
| 22 | man1dir=$(man1dir) man1ext=$(man1ext) \ |
| 23 | man3dir=$(man3dir) man3ext=$(man3ext) \ |
| 24 | infodir=$(infodir) htmldir=$(htmldir) $@ ) |
| 25 | diff -Nru bash-2.05/doc/Makefile.in bash-2.05.new/doc/Makefile.in |
| 26 | --- bash-2.05/doc/Makefile.in Mon Mar 19 16:14:11 2001 |
| 27 | +++ bash-2.05.new/doc/Makefile.in Thu Apr 19 03:07:22 2001 |
| 28 | @@ -209,34 +209,34 @@ |
| 29 | $(RM) Makefile |
| 30 | |
| 31 | installdirs: |
| 32 | - -test -d $(man1dir) || $(SHELL) ${MKDIRS} $(man1dir) |
| 33 | - -test -d $(infodir) || $(SHELL) ${MKDIRS} $(infodir) |
| 34 | + -test -d $(DESTDIR)$(man1dir) || $(SHELL) ${MKDIRS} $(DESTDIR)$(man1dir) |
| 35 | + -test -d $(DESTDIR)$(infodir) || $(SHELL) ${MKDIRS} $(DESTDIR)$(infodir) |
| 36 | -if [ -n "$(htmldir)" ]; then \ |
| 37 | - test -d $(htmldir) || $(SHELL) ${MKDIRS} $(htmldir) ; \ |
| 38 | + test -d $(DESTDIR)$(htmldir) || $(SHELL) ${MKDIRS} $(DESTDIR)$(htmldir) ; \ |
| 39 | fi |
| 40 | |
| 41 | install: info installdirs |
| 42 | - -$(INSTALL_DATA) $(srcdir)/bash.1 $(man1dir)/bash.${man1ext} |
| 43 | - -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(man1dir)/bashbug.${man1ext} |
| 44 | + -$(INSTALL_DATA) $(srcdir)/bash.1 $(DESTDIR)$(man1dir)/bash.${man1ext} |
| 45 | + -$(INSTALL_DATA) $(srcdir)/bashbug.1 $(DESTDIR)$(man1dir)/bashbug.${man1ext} |
| 46 | # uncomment the next line to install the builtins man page |
| 47 | # $(INSTALL_DATA) $(srcdir)/builtins.1 $(man1dir)/bash_builtins.${man1ext} |
| 48 | - -$(INSTALL_DATA) $(srcdir)/bashref.info $(infodir)/bash.info |
| 49 | + -$(INSTALL_DATA) $(srcdir)/bashref.info $(DESTDIR)$(infodir)/bash.info |
| 50 | # run install-info if it is present to update the info directory |
| 51 | if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ |
| 52 | - install-info --dir-file=$(infodir)/dir $(infodir)/bash.info; \ |
| 53 | + install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/bash.info; \ |
| 54 | else true; fi |
| 55 | # if htmldir is set, install the html files into that directory |
| 56 | - -if [ -n "${htmldir}" ]; then \ |
| 57 | - $(INSTALL_DATA) $(srcdir)/bash.html $(htmldir) ; \ |
| 58 | - $(INSTALL_DATA) $(srcdir)/bashref.html $(htmldir) ; \ |
| 59 | + -if [ -n "$(DESTDIR)${htmldir}" ]; then \ |
| 60 | + $(INSTALL_DATA) $(srcdir)/bash.html $(DESTDIR)$(htmldir) ; \ |
| 61 | + $(INSTALL_DATA) $(srcdir)/bashref.html $(DESTDIR)$(htmldir) ; \ |
| 62 | fi |
| 63 | |
| 64 | uninstall: |
| 65 | - -$(RM) $(man1dir)/bash.${man1ext} $(man1dir)/bashbug.${man1ext} |
| 66 | - $(RM) $(infodir)/bash.info |
| 67 | + -$(RM) $(DESTDIR)$(man1dir)/bash.${man1ext} $(DESTDIR)$(man1dir)/bashbug.${man1ext} |
| 68 | + $(RM) $(DESTDIR)$(infodir)/bash.info |
| 69 | -if [ -n "$(htmldir)" ]; then \ |
| 70 | - $(RM) $(htmldir)/bash.html ; \ |
| 71 | - $(RM) $(htmldir)/bashref.html ; \ |
| 72 | + $(RM) $(DESTDIR)$(htmldir)/bash.html ; \ |
| 73 | + $(RM) $(DESTDIR)$(htmldir)/bashref.html ; \ |
| 74 | fi |
| 75 | |
| 76 | # for use by chet |
projects / packages / bash.git / blame