diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-05 13:06:32 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-13 12:15:25 +0000 |
| commit | 29327b9936c7e268e6e552f8632ab5f64b49ee9a (patch) | |
| tree | 2fe3daacd11d285ba6dde7d39113d19331107526 /meta/packages/mtools/files/mtools.patch | |
| parent | 3d6e2461881cae11e8b9ad7cab4f085b8ad9ce2d (diff) | |
| download | poky-29327b9936c7e268e6e552f8632ab5f64b49ee9a.tar.gz | |
mtools: Convert to BBCLASSEXTEND
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/mtools/files/mtools.patch')
| -rw-r--r-- | meta/packages/mtools/files/mtools.patch | 127 |
1 files changed, 0 insertions, 127 deletions
diff --git a/meta/packages/mtools/files/mtools.patch b/meta/packages/mtools/files/mtools.patch deleted file mode 100644 index 2abf534731..0000000000 --- a/meta/packages/mtools/files/mtools.patch +++ /dev/null | |||
| @@ -1,127 +0,0 @@ | |||
| 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 | Index: mtools-3.9.9/Makefile.in | ||
| 8 | =================================================================== | ||
| 9 | --- mtools-3.9.9.orig/Makefile.in 2007-10-12 11:18:46.000000000 +0100 | ||
| 10 | +++ mtools-3.9.9/Makefile.in 2007-10-12 11:28:14.000000000 +0100 | ||
| 11 | @@ -195,30 +195,22 @@ html: mtools.html mtools_toc.html | ||
| 12 | |||
| 13 | # Don't cd, to avoid breaking install-sh references. | ||
| 14 | install-info: info | ||
| 15 | - $(top_srcdir)/mkinstalldirs $(infodir) | ||
| 16 | + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir) | ||
| 17 | if test -f mtools.info; then \ | ||
| 18 | for i in mtools.info*; do \ | ||
| 19 | - $(INSTALL_DATA) $$i $(infodir)/$$i; \ | ||
| 20 | + $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \ | ||
| 21 | done; \ | ||
| 22 | else \ | ||
| 23 | for i in $(srcdir)/mtools.info*; do \ | ||
| 24 | - $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ | ||
| 25 | + $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ | ||
| 26 | done; \ | ||
| 27 | fi; \ | ||
| 28 | - if [ -n "$(INSTALL_INFO)" ] ; then \ | ||
| 29 | - if [ -f $(infodir)/dir.info ] ; then \ | ||
| 30 | - $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \ | ||
| 31 | - fi; \ | ||
| 32 | - if [ -f $(infodir)/dir ] ; then \ | ||
| 33 | - $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \ | ||
| 34 | - fi; \ | ||
| 35 | - fi | ||
| 36 | |||
| 37 | uninstall-info: | ||
| 38 | cd $(infodir) && rm -f mtools.info* | ||
| 39 | |||
| 40 | -install: $(bindir)/mtools @BINFLOPPYD@ install-man install-links \ | ||
| 41 | - $(bindir)/mkmanifest install-scripts install-info | ||
| 42 | +install: ${DESTDIR}$(bindir)/mtools ${DESTDIR}$(bindir)/floppyd install-man install-links \ | ||
| 43 | + ${DESTDIR}$(bindir)/mkmanifest install-scripts install-info | ||
| 44 | |||
| 45 | uninstall: uninstall-bin uninstall-man uninstall-links \ | ||
| 46 | uninstall-scripts | ||
| 47 | @@ -228,52 +220,52 @@ distclean: clean texclean | ||
| 48 | maintainer-clean: distclean | ||
| 49 | |||
| 50 | |||
| 51 | -$(bindir)/floppyd: floppyd | ||
| 52 | - $(top_srcdir)/mkinstalldirs $(bindir) | ||
| 53 | - $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd | ||
| 54 | +${DESTDIR}$(bindir)/floppyd: floppyd | ||
| 55 | + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) | ||
| 56 | + $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd | ||
| 57 | |||
| 58 | -$(bindir)/floppyd_installtest: floppyd_installtest | ||
| 59 | - $(top_srcdir)/mkinstalldirs $(bindir) | ||
| 60 | - $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest | ||
| 61 | +${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest | ||
| 62 | + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) | ||
| 63 | + $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest | ||
| 64 | |||
| 65 | -$(bindir)/mtools: mtools | ||
| 66 | - $(top_srcdir)/mkinstalldirs $(bindir) | ||
| 67 | - $(INSTALL_PROGRAM) mtools $(bindir)/mtools | ||
| 68 | +${DESTDIR}$(bindir)/mtools: mtools | ||
| 69 | + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) | ||
| 70 | + $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools | ||
| 71 | |||
| 72 | -$(bindir)/mkmanifest: mkmanifest | ||
| 73 | - $(top_srcdir)/mkinstalldirs $(bindir) | ||
| 74 | - $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest | ||
| 75 | +${DESTDIR}$(bindir)/mkmanifest: mkmanifest | ||
| 76 | + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) | ||
| 77 | + $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest | ||
| 78 | |||
| 79 | #$(ETCDIR)/mtools: mtools.etc | ||
| 80 | # cp mtools.etc $(ETCDIR)/mtools | ||
| 81 | |||
| 82 | -install-links: $(bindir)/mtools | ||
| 83 | +install-links: ${DESTDIR}$(bindir)/mtools | ||
| 84 | @for j in $(LINKS); do \ | ||
| 85 | - rm -f $(bindir)/$$j ; \ | ||
| 86 | - $(LN_S) mtools $(bindir)/$$j ; \ | ||
| 87 | - echo $(bindir)/$$j ; \ | ||
| 88 | + rm -f ${DESTDIR}$(bindir)/$$j ; \ | ||
| 89 | + $(LN_S) mtools ${DESTDIR}$(bindir)/$$j ; \ | ||
| 90 | + echo ${DESTDIR}$(bindir)/$$j ; \ | ||
| 91 | done | ||
| 92 | |||
| 93 | ## "z" is the older version of "gz"; the name is just *too* short | ||
| 94 | -install-scripts: $(bindir)/mtools | ||
| 95 | - @$(top_srcdir)/mkinstalldirs $(bindir) | ||
| 96 | +install-scripts: ${DESTDIR}$(bindir)/mtools | ||
| 97 | + @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) | ||
| 98 | @for j in $(SCRIPTS) ; do \ | ||
| 99 | - $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \ | ||
| 100 | - echo $(bindir)/$$j ; \ | ||
| 101 | + $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \ | ||
| 102 | + echo ${DESTDIR}$(bindir)/$$j ; \ | ||
| 103 | done | ||
| 104 | - rm -f $(bindir)/lz | ||
| 105 | - $(LN_S) uz $(bindir)/lz | ||
| 106 | + rm -f ${DESTDIR}$(bindir)/lz | ||
| 107 | + $(LN_S) uz ${DESTDIR}$(bindir)/lz | ||
| 108 | |||
| 109 | install-man: | ||
| 110 | - @$(top_srcdir)/mkinstalldirs $(MAN1DIR) | ||
| 111 | + @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN1DIR) | ||
| 112 | @for j in $(MAN1); do \ | ||
| 113 | - $(INSTALL_DATA) $(srcdir)/$$j $(MAN1DIR)/$$j ; \ | ||
| 114 | - echo $(MAN1DIR)/$$j ; \ | ||
| 115 | + $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN1DIR)/$$j ; \ | ||
| 116 | + echo ${DESTDIR}$(MAN1DIR)/$$j ; \ | ||
| 117 | done | ||
| 118 | - @$(top_srcdir)/mkinstalldirs $(MAN5DIR) | ||
| 119 | + @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN5DIR) | ||
| 120 | @for j in $(MAN5); do \ | ||
| 121 | - $(INSTALL_DATA) $(srcdir)/$$j $(MAN5DIR)/$$j ; \ | ||
| 122 | - echo $(MAN5DIR)/$$j ; \ | ||
| 123 | + $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN5DIR)/$$j ; \ | ||
| 124 | + echo ${DESTDIR}$(MAN5DIR)/$$j ; \ | ||
| 125 | done | ||
| 126 | |||
| 127 | uninstall-bin: | ||
