Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | $NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $ |
| 2 | |
| 3 | --- |
| 4 | Makefile.in | 74 ++++++++++++++++++++++++++---------------------------------- |
| 5 | 1 file changed, 33 insertions(+), 41 deletions(-) |
| 6 | |
| 7 | Upstream-Status: Inappropriate [licensing] |
| 8 | |
| 9 | Index: mtools-3.9.9/Makefile.in |
| 10 | =================================================================== |
| 11 | --- mtools-3.9.9.orig/Makefile.in 2007-10-12 11:18:46.000000000 +0100 |
| 12 | +++ mtools-3.9.9/Makefile.in 2007-10-12 11:28:14.000000000 +0100 |
| 13 | @@ -195,30 +195,22 @@ html: mtools.html mtools_toc.html |
| 14 | |
| 15 | # Don't cd, to avoid breaking install-sh references. |
| 16 | install-info: info |
| 17 | - $(top_srcdir)/mkinstalldirs $(infodir) |
| 18 | + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir) |
| 19 | if test -f mtools.info; then \ |
| 20 | for i in mtools.info*; do \ |
| 21 | - $(INSTALL_DATA) $$i $(infodir)/$$i; \ |
| 22 | + $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \ |
| 23 | done; \ |
| 24 | else \ |
| 25 | for i in $(srcdir)/mtools.info*; do \ |
| 26 | - $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ |
| 27 | + $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ |
| 28 | done; \ |
| 29 | fi; \ |
| 30 | - if [ -n "$(INSTALL_INFO)" ] ; then \ |
| 31 | - if [ -f $(infodir)/dir.info ] ; then \ |
| 32 | - $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \ |
| 33 | - fi; \ |
| 34 | - if [ -f $(infodir)/dir ] ; then \ |
| 35 | - $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \ |
| 36 | - fi; \ |
| 37 | - fi |
| 38 | |
| 39 | uninstall-info: |
| 40 | cd $(infodir) && rm -f mtools.info* |
| 41 | |
| 42 | -install: $(bindir)/mtools @BINFLOPPYD@ install-man install-links \ |
| 43 | - $(bindir)/mkmanifest install-scripts install-info |
| 44 | +install: ${DESTDIR}$(bindir)/mtools ${DESTDIR}$(bindir)/floppyd install-man install-links \ |
| 45 | + ${DESTDIR}$(bindir)/mkmanifest install-scripts install-info |
| 46 | |
| 47 | uninstall: uninstall-bin uninstall-man uninstall-links \ |
| 48 | uninstall-scripts |
| 49 | @@ -228,52 +220,52 @@ distclean: clean texclean |
| 50 | maintainer-clean: distclean |
| 51 | |
| 52 | |
| 53 | -$(bindir)/floppyd: floppyd |
| 54 | - $(top_srcdir)/mkinstalldirs $(bindir) |
| 55 | - $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd |
| 56 | +${DESTDIR}$(bindir)/floppyd: floppyd |
| 57 | + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) |
| 58 | + $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd |
| 59 | |
| 60 | -$(bindir)/floppyd_installtest: floppyd_installtest |
| 61 | - $(top_srcdir)/mkinstalldirs $(bindir) |
| 62 | - $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest |
| 63 | +${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest |
| 64 | + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) |
| 65 | + $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest |
| 66 | |
| 67 | -$(bindir)/mtools: mtools |
| 68 | - $(top_srcdir)/mkinstalldirs $(bindir) |
| 69 | - $(INSTALL_PROGRAM) mtools $(bindir)/mtools |
| 70 | +${DESTDIR}$(bindir)/mtools: mtools |
| 71 | + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) |
| 72 | + $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools |
| 73 | |
| 74 | -$(bindir)/mkmanifest: mkmanifest |
| 75 | - $(top_srcdir)/mkinstalldirs $(bindir) |
| 76 | - $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest |
| 77 | +${DESTDIR}$(bindir)/mkmanifest: mkmanifest |
| 78 | + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) |
| 79 | + $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest |
| 80 | |
| 81 | #$(ETCDIR)/mtools: mtools.etc |
| 82 | # cp mtools.etc $(ETCDIR)/mtools |
| 83 | |
| 84 | -install-links: $(bindir)/mtools |
| 85 | +install-links: ${DESTDIR}$(bindir)/mtools |
| 86 | @for j in $(LINKS); do \ |
| 87 | - rm -f $(bindir)/$$j ; \ |
| 88 | - $(LN_S) mtools $(bindir)/$$j ; \ |
| 89 | - echo $(bindir)/$$j ; \ |
| 90 | + rm -f ${DESTDIR}$(bindir)/$$j ; \ |
| 91 | + $(LN_S) mtools ${DESTDIR}$(bindir)/$$j ; \ |
| 92 | + echo ${DESTDIR}$(bindir)/$$j ; \ |
| 93 | done |
| 94 | |
| 95 | ## "z" is the older version of "gz"; the name is just *too* short |
| 96 | -install-scripts: $(bindir)/mtools |
| 97 | - @$(top_srcdir)/mkinstalldirs $(bindir) |
| 98 | +install-scripts: ${DESTDIR}$(bindir)/mtools |
| 99 | + @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) |
| 100 | @for j in $(SCRIPTS) ; do \ |
| 101 | - $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \ |
| 102 | - echo $(bindir)/$$j ; \ |
| 103 | + $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \ |
| 104 | + echo ${DESTDIR}$(bindir)/$$j ; \ |
| 105 | done |
| 106 | - rm -f $(bindir)/lz |
| 107 | - $(LN_S) uz $(bindir)/lz |
| 108 | + rm -f ${DESTDIR}$(bindir)/lz |
| 109 | + $(LN_S) uz ${DESTDIR}$(bindir)/lz |
| 110 | |
| 111 | install-man: |
| 112 | - @$(top_srcdir)/mkinstalldirs $(MAN1DIR) |
| 113 | + @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN1DIR) |
| 114 | @for j in $(MAN1); do \ |
| 115 | - $(INSTALL_DATA) $(srcdir)/$$j $(MAN1DIR)/$$j ; \ |
| 116 | - echo $(MAN1DIR)/$$j ; \ |
| 117 | + $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN1DIR)/$$j ; \ |
| 118 | + echo ${DESTDIR}$(MAN1DIR)/$$j ; \ |
| 119 | done |
| 120 | - @$(top_srcdir)/mkinstalldirs $(MAN5DIR) |
| 121 | + @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN5DIR) |
| 122 | @for j in $(MAN5); do \ |
| 123 | - $(INSTALL_DATA) $(srcdir)/$$j $(MAN5DIR)/$$j ; \ |
| 124 | - echo $(MAN5DIR)/$$j ; \ |
| 125 | + $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN5DIR)/$$j ; \ |
| 126 | + echo ${DESTDIR}$(MAN5DIR)/$$j ; \ |
| 127 | done |
| 128 | |
| 129 | uninstall-bin: |