mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

mtools: Remove install-info commands to unbreak build

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2873 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-10-12 09:59:29 +00:00
parent 2ab0d93057
commit d49a4efedb
2 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/packages/mtools/files/mtools.patch
+28 -27
View File
@@ -1,8 +1,14 @@
$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $ $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 Makefile.in | 74 ++++++++++++++++++++++++++----------------------------------
@@ -195,30 +195,30 @@ html: mtools.html mtools_toc.html 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. # Don't cd, to avoid breaking install-sh references.
install-info: info 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)/||'`; \ + $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
done; \ done; \
fi; \ fi; \
if [ -n "$(INSTALL_INFO)" ] ; then \ - if [ -n "$(INSTALL_INFO)" ] ; then \
if [ -f $(infodir)/dir.info ] ; then \ - if [ -f $(infodir)/dir.info ] ; then \
- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \ - $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \
+ $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir.info; \ - fi; \
fi; \ - if [ -f $(infodir)/dir ] ; then \
if [ -f $(infodir)/dir ] ; then \
- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \ - $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \
+ $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir; \ - fi; \
fi; \ - fi
fi
uninstall-info: uninstall-info:
cd $(infodir) && rm -f mtools.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: uninstall-bin uninstall-man uninstall-links \
uninstall-scripts uninstall-scripts
@@ -228,52 +228,52 @@ distclean: clean texclean @@ -228,52 +220,52 @@ distclean: clean texclean
maintainer-clean: distclean maintainer-clean: distclean
-$(bindir)/floppyd: floppyd -$(bindir)/floppyd: floppyd
- $(top_srcdir)/mkinstalldirs $(bindir) - $(top_srcdir)/mkinstalldirs $(bindir)
- $(INSTALL_PROGRAM) floppyd $(bindir)/floppyd - $(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 +${DESTDIR}$(bindir)/floppyd: floppyd
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd + $(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 +${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest + $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest
+
-$(bindir)/mtools: mtools
- $(top_srcdir)/mkinstalldirs $(bindir)
- $(INSTALL_PROGRAM) mtools $(bindir)/mtools
+${DESTDIR}$(bindir)/mtools: mtools +${DESTDIR}$(bindir)/mtools: mtools
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools + $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools
+
-$(bindir)/mkmanifest: mkmanifest
- $(top_srcdir)/mkinstalldirs $(bindir)
- $(INSTALL_PROGRAM) mkmanifest $(bindir)/mkmanifest
+${DESTDIR}$(bindir)/mkmanifest: mkmanifest +${DESTDIR}$(bindir)/mkmanifest: mkmanifest
+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir) + $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
+ $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest + $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest
meta/packages/mtools/mtools_3.9.9.bb
+1 -1
View File
@@ -5,7 +5,7 @@
DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them." DESCRIPTION="Mtools is a collection of utilities for accessing MS-DOS disks from Unix without mounting them."
HOMEPAGE="http://mtools.linux.lu" HOMEPAGE="http://mtools.linux.lu"
LICENSE="GPL" LICENSE="GPL"
PR = "r1" PR = "r2"
SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \ SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \
file://mtools-makeinfo.patch;patch=1 \ file://mtools-makeinfo.patch;patch=1 \