summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-10-12 09:59:29 +0000
committerRichard Purdie <richard@openedhand.com>2007-10-12 09:59:29 +0000
commitd49a4efedb40e603d87154d9c49b00e27605ff2e (patch)
tree6c41d667d705c6251a7f161981731a4db11f603c /meta
parent2ab0d930571d66d4bc8c05c721f156b328da1002 (diff)
downloadopenembedded-core-d49a4efedb40e603d87154d9c49b00e27605ff2e.tar.gz
openembedded-core-d49a4efedb40e603d87154d9c49b00e27605ff2e.tar.bz2
openembedded-core-d49a4efedb40e603d87154d9c49b00e27605ff2e.tar.xz
openembedded-core-d49a4efedb40e603d87154d9c49b00e27605ff2e.zip
mtools: Remove install-info commands to unbreak build
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2873 311d38ba-8fff-0310-9ca6-ca027cbcb966
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 47404c6b3..2abf53473 100644
--- a/meta/packages/mtools/files/mtools.patch
+++ b/meta/packages/mtools/files/mtools.patch
@@ -1,8 +1,14 @@
$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
---- mtools-3.9.9/Makefile.in.orig 2004-02-28 20:06:35.000000000 +0100
-+++ mtools-3.9.9/Makefile.in
-@@ -195,30 +195,30 @@ html: mtools.html mtools_toc.html
+---
+ Makefile.in | 74 ++++++++++++++++++++++++++----------------------------------
+ 1 file changed, 33 insertions(+), 41 deletions(-)
+
+Index: mtools-3.9.9/Makefile.in
+===================================================================
+--- mtools-3.9.9.orig/Makefile.in 2007-10-12 11:18:46.000000000 +0100
++++ mtools-3.9.9/Makefile.in 2007-10-12 11:28:14.000000000 +0100
+@@ -195,30 +195,22 @@ html: mtools.html mtools_toc.html
# Don't cd, to avoid breaking install-sh references.
install-info: info
@@ -19,16 +25,14 @@ $NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
done; \
fi; \
- if [ -n "$(INSTALL_INFO)" ] ; then \
- if [ -f $(infodir)/dir.info ] ; then \
+- if [ -n "$(INSTALL_INFO)" ] ; then \
+- if [ -f $(infodir)/dir.info ] ; then \
- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \
-+ $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir.info; \
- fi; \
- if [ -f $(infodir)/dir ] ; then \
+- fi; \
+- if [ -f $(infodir)/dir ] ; then \
- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \
-+ $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir; \
- fi; \
- fi
+- fi; \
+- fi
uninstall-info:
cd $(infodir) && rm -f mtools.info*
@@ -40,37 +44,34 @@ $NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
uninstall: uninstall-bin uninstall-man uninstall-links \
uninstall-scripts
-@@ -228,52 +228,52 @@ distclean: clean texclean
+@@ -228,52 +220,52 @@ distclean: clean texclean
maintainer-clean: distclean
-$(bindir)/floppyd: floppyd
- $(top_srcdir)/mkinstalldirs $(bindir)
- $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd
--
--$(bindir)/floppyd_installtest: floppyd_installtest
-- $(top_srcdir)/mkinstalldirs $(bindir)
-- $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest
--
--$(bindir)/mtools: mtools
-- $(top_srcdir)/mkinstalldirs $(bindir)
-- $(INSTALL_PROGRAM) mtools $(bindir)/mtools
--
--$(bindir)/mkmanifest: mkmanifest
-- $(top_srcdir)/mkinstalldirs $(bindir)
-- $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
+${DESTDIR}$(bindir)/floppyd: floppyd
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd
-+
+
+-$(bindir)/floppyd_installtest: floppyd_installtest
+- $(top_srcdir)/mkinstalldirs $(bindir)
+- $(INSTALL_PROGRAM) floppyd_installtest $(bindir)/floppyd_installtest
+${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest
-+
+
+-$(bindir)/mtools: mtools
+- $(top_srcdir)/mkinstalldirs $(bindir)
+- $(INSTALL_PROGRAM) mtools $(bindir)/mtools
+${DESTDIR}$(bindir)/mtools: mtools
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools
-+
+
+-$(bindir)/mkmanifest: mkmanifest
+- $(top_srcdir)/mkinstalldirs $(bindir)
+- $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
+${DESTDIR}$(bindir)/mkmanifest: mkmanifest
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
+ $(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 112fff8f3..7c872a144 100644
--- a/meta/packages/mtools/mtools_3.9.9.bb
+++ b/meta/packages/mtools/mtools_3.9.9.bb
@@ -5,7 +5,7 @@
DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them."
HOMEPAGE="http://mtools.linux.lu"
LICENSE="GPL"
-PR = "r1"
+PR = "r2"
SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \
file://mtools-makeinfo.patch;patch=1 \