summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/mtools/files/mtools.patch55
-rw-r--r--meta/packages/mtools/mtools_3.9.9.bb2
2 files changed, 29 insertions, 28 deletions
diff --git a/meta/packages/mtools/files/mtools.patch b/meta/packages/mtools/files/mtools.patch
index 47404c6b33..2abf534731 100644
--- a/meta/packages/mtools/files/mtools.patch
+++ b/meta/packages/mtools/files/mtools.patch
@@ -1,8 +1,14 @@
1$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $ 1$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
2 2
3--- mtools-3.9.9/Makefile.in.orig 2004-02-28 20:06:35.000000000 +0100 3---
4+++ mtools-3.9.9/Makefile.in 4 Makefile.in | 74 ++++++++++++++++++++++++++----------------------------------
5@@ -195,30 +195,30 @@ html: mtools.html mtools_toc.html 5 1 file changed, 33 insertions(+), 41 deletions(-)
6
7Index: 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
6 12
7 # Don't cd, to avoid breaking install-sh references. 13 # Don't cd, to avoid breaking install-sh references.
8 install-info: info 14 install-info: info
@@ -19,16 +25,14 @@ $NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
19+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \ 25+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
20 done; \ 26 done; \
21 fi; \ 27 fi; \
22 if [ -n "$(INSTALL_INFO)" ] ; then \ 28- if [ -n "$(INSTALL_INFO)" ] ; then \
23 if [ -f $(infodir)/dir.info ] ; then \ 29- if [ -f $(infodir)/dir.info ] ; then \
24- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \ 30- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \
25+ $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir.info; \ 31- fi; \
26 fi; \ 32- if [ -f $(infodir)/dir ] ; then \
27 if [ -f $(infodir)/dir ] ; then \
28- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \ 33- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \
29+ $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir; \ 34- fi; \
30 fi; \ 35- fi
31 fi
32 36
33 uninstall-info: 37 uninstall-info:
34 cd $(infodir) && rm -f mtools.info* 38 cd $(infodir) && rm -f mtools.info*
@@ -40,37 +44,34 @@ $NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
40 44
41 uninstall: uninstall-bin uninstall-man uninstall-links \ 45 uninstall: uninstall-bin uninstall-man uninstall-links \
42 uninstall-scripts 46 uninstall-scripts
43@@ -228,52 +228,52 @@ distclean: clean texclean 47@@ -228,52 +220,52 @@ distclean: clean texclean
44 maintainer-clean: distclean 48 maintainer-clean: distclean
45 49
46 50
47-$(bindir)/floppyd: floppyd 51-$(bindir)/floppyd: floppyd
48- $(top_srcdir)/mkinstalldirs $(bindir) 52- $(top_srcdir)/mkinstalldirs $(bindir)
49- $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd 53- $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd
50-
51-$(bindir)/floppyd_installtest: floppyd_installtest
52- $(top_srcdir)/mkinstalldirs $(bindir)
53- $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest
54-
55-$(bindir)/mtools: mtools
56- $(top_srcdir)/mkinstalldirs $(bindir)
57- $(INSTALL_PROGRAM) mtools $(bindir)/mtools
58-
59-$(bindir)/mkmanifest: mkmanifest
60- $(top_srcdir)/mkinstalldirs $(bindir)
61- $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
62+${DESTDIR}$(bindir)/floppyd: floppyd 54+${DESTDIR}$(bindir)/floppyd: floppyd
63+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) 55+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
64+ $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd 56+ $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd
65+ 57
58-$(bindir)/floppyd_installtest: floppyd_installtest
59- $(top_srcdir)/mkinstalldirs $(bindir)
60- $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest
66+${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest 61+${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest
67+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) 62+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
68+ $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest 63+ $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest
69+ 64
65-$(bindir)/mtools: mtools
66- $(top_srcdir)/mkinstalldirs $(bindir)
67- $(INSTALL_PROGRAM) mtools $(bindir)/mtools
70+${DESTDIR}$(bindir)/mtools: mtools 68+${DESTDIR}$(bindir)/mtools: mtools
71+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) 69+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
72+ $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools 70+ $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools
73+ 71
72-$(bindir)/mkmanifest: mkmanifest
73- $(top_srcdir)/mkinstalldirs $(bindir)
74- $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
74+${DESTDIR}$(bindir)/mkmanifest: mkmanifest 75+${DESTDIR}$(bindir)/mkmanifest: mkmanifest
75+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) 76+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
76+ $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest 77+ $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest
diff --git a/meta/packages/mtools/mtools_3.9.9.bb b/meta/packages/mtools/mtools_3.9.9.bb
index 112fff8f37..7c872a144f 100644
--- a/meta/packages/mtools/mtools_3.9.9.bb
+++ b/meta/packages/mtools/mtools_3.9.9.bb
@@ -5,7 +5,7 @@
5DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them." 5DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them."
6HOMEPAGE="http://mtools.linux.lu" 6HOMEPAGE="http://mtools.linux.lu"
7LICENSE="GPL" 7LICENSE="GPL"
8PR = "r1" 8PR = "r2"
9 9
10SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \ 10SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \
11 file://mtools-makeinfo.patch;patch=1 \ 11 file://mtools-makeinfo.patch;patch=1 \