summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/packages/mtools/files/mtools.patch126
-rw-r--r--meta/packages/mtools/mtools_3.9.9.bb4
2 files changed, 129 insertions, 1 deletions
diff --git a/meta/packages/mtools/files/mtools.patch b/meta/packages/mtools/files/mtools.patch
new file mode 100644
index 0000000000..47404c6b33
--- /dev/null
+++ b/meta/packages/mtools/files/mtools.patch
@@ -0,0 +1,126 @@
1$NetBSD: patch-aa,v 1.10 2007/08/17 20:55:34 joerg Exp $
2
3--- mtools-3.9.9/Makefile.in.orig 2004-02-28 20:06:35.000000000 +0100
4+++ mtools-3.9.9/Makefile.in
5@@ -195,30 +195,30 @@ html: mtools.html mtools_toc.html
6
7 # Don't cd, to avoid breaking install-sh references.
8 install-info: info
9- $(top_srcdir)/mkinstalldirs $(infodir)
10+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(infodir)
11 if test -f mtools.info; then \
12 for i in mtools.info*; do \
13- $(INSTALL_DATA) $$i $(infodir)/$$i; \
14+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/$$i; \
15 done; \
16 else \
17 for i in $(srcdir)/mtools.info*; do \
18- $(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
19+ $(INSTALL_DATA) $$i ${DESTDIR}$(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
20 done; \
21 fi; \
22 if [ -n "$(INSTALL_INFO)" ] ; then \
23 if [ -f $(infodir)/dir.info ] ; then \
24- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir.info; \
25+ $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir.info; \
26 fi; \
27 if [ -f $(infodir)/dir ] ; then \
28- $(INSTALL_INFO) $(infodir)/mtools.info $(infodir)/dir; \
29+ $(INSTALL_INFO) ${DESTDIR}$(infodir)/mtools.info ${DESTDIR}$(infodir)/dir; \
30 fi; \
31 fi
32
33 uninstall-info:
34 cd $(infodir) && rm -f mtools.info*
35
36-install: $(bindir)/mtools @BINFLOPPYD@ install-man install-links \
37- $(bindir)/mkmanifest install-scripts install-info
38+install: ${DESTDIR}$(bindir)/mtools ${DESTDIR}$(bindir)/floppyd install-man install-links \
39+ ${DESTDIR}$(bindir)/mkmanifest install-scripts install-info
40
41 uninstall: uninstall-bin uninstall-man uninstall-links \
42 uninstall-scripts
43@@ -228,52 +228,52 @@ distclean: clean texclean
44 maintainer-clean: distclean
45
46
47-$(bindir)/floppyd: floppyd
48- $(top_srcdir)/mkinstalldirs $(bindir)
49- $(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
63+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
64+ $(INSTALL_PROGRAM) floppyd ${DESTDIR}$(bindir)/floppyd
65+
66+${DESTDIR}$(bindir)/floppyd_installtest: floppyd_installtest
67+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
68+ $(INSTALL_PROGRAM) floppyd_installtest ${DESTDIR}$(bindir)/floppyd_installtest
69+
70+${DESTDIR}$(bindir)/mtools: mtools
71+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
72+ $(INSTALL_PROGRAM) mtools ${DESTDIR}$(bindir)/mtools
73+
74+${DESTDIR}$(bindir)/mkmanifest: mkmanifest
75+ $(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
76+ $(INSTALL_PROGRAM) mkmanifest ${DESTDIR}$(bindir)/mkmanifest
77
78 #$(ETCDIR)/mtools: mtools.etc
79 # cp mtools.etc $(ETCDIR)/mtools
80
81-install-links: $(bindir)/mtools
82+install-links: ${DESTDIR}$(bindir)/mtools
83 @for j in $(LINKS); do \
84- rm -f $(bindir)/$$j ; \
85- $(LN_S) mtools $(bindir)/$$j ; \
86- echo $(bindir)/$$j ; \
87+ rm -f ${DESTDIR}$(bindir)/$$j ; \
88+ $(LN_S) mtools ${DESTDIR}$(bindir)/$$j ; \
89+ echo ${DESTDIR}$(bindir)/$$j ; \
90 done
91
92 ## "z" is the older version of "gz"; the name is just *too* short
93-install-scripts: $(bindir)/mtools
94- @$(top_srcdir)/mkinstalldirs $(bindir)
95+install-scripts: ${DESTDIR}$(bindir)/mtools
96+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
97 @for j in $(SCRIPTS) ; do \
98- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
99- echo $(bindir)/$$j ; \
100+ $(INSTALL_SCRIPT) $(srcdir)/scripts/$$j ${DESTDIR}$(bindir)/$$j ; \
101+ echo ${DESTDIR}$(bindir)/$$j ; \
102 done
103- rm -f $(bindir)/lz
104- $(LN_S) uz $(bindir)/lz
105+ rm -f ${DESTDIR}$(bindir)/lz
106+ $(LN_S) uz ${DESTDIR}$(bindir)/lz
107
108 install-man:
109- @$(top_srcdir)/mkinstalldirs $(MAN1DIR)
110+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN1DIR)
111 @for j in $(MAN1); do \
112- $(INSTALL_DATA) $(srcdir)/$$j $(MAN1DIR)/$$j ; \
113- echo $(MAN1DIR)/$$j ; \
114+ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN1DIR)/$$j ; \
115+ echo ${DESTDIR}$(MAN1DIR)/$$j ; \
116 done
117- @$(top_srcdir)/mkinstalldirs $(MAN5DIR)
118+ @$(top_srcdir)/mkinstalldirs ${DESTDIR}$(MAN5DIR)
119 @for j in $(MAN5); do \
120- $(INSTALL_DATA) $(srcdir)/$$j $(MAN5DIR)/$$j ; \
121- echo $(MAN5DIR)/$$j ; \
122+ $(INSTALL_DATA) $(srcdir)/$$j ${DESTDIR}$(MAN5DIR)/$$j ; \
123+ echo ${DESTDIR}$(MAN5DIR)/$$j ; \
124 done
125
126 uninstall-bin:
diff --git a/meta/packages/mtools/mtools_3.9.9.bb b/meta/packages/mtools/mtools_3.9.9.bb
index 90b1cf5830..112fff8f37 100644
--- a/meta/packages/mtools/mtools_3.9.9.bb
+++ b/meta/packages/mtools/mtools_3.9.9.bb
@@ -5,9 +5,11 @@
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"
8 9
9SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \ 10SRC_URI="http://mtools.linux.lu/mtools-${PV}.tar.gz \
10 file://mtools-makeinfo.patch;patch=1" 11 file://mtools-makeinfo.patch;patch=1 \
12 file://mtools.patch;patch=1"
11 13
12#DEPENDS = "tetex-native" 14#DEPENDS = "tetex-native"
13 15
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 08:49:54 +0000