summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2007-01-22 23:25:11 +0000
committerPhilip Balister <philip@balister.org>2007-01-22 23:25:11 +0000
commitc96ddb61ffaf0f356557ba5e18602458367bc398 (patch)
tree41011a2a46826ecdd16c3893fc82765819260673 /packages
parent1a2ae11fe27018575b72e88a0f36c48630863237 (diff)
parent38d7089c99d4ef83c3bda03955c85cefd39a5bd1 (diff)
merge of '6a884c524b47bc199d7c8fb08262ba476bc25c13'
and '7bd390b94b4b2318084dc7d7e08bd8b0aa9e129f'
Diffstat (limited to 'packages')
-rw-r--r--packages/m4/m4-native_1.4.4.bb (renamed from packages/m4/m4-native_1.4.2.bb)0
-rw-r--r--packages/m4/m4/make.patch41
-rw-r--r--packages/m4/m4_1.4.4.bb (renamed from packages/m4/m4_1.4.2.bb)3
3 files changed, 1 insertions, 43 deletions
diff --git a/packages/m4/m4-native_1.4.2.bb b/packages/m4/m4-native_1.4.4.bb
index 8beb8748e3..8beb8748e3 100644
--- a/packages/m4/m4-native_1.4.2.bb
+++ b/packages/m4/m4-native_1.4.4.bb
diff --git a/packages/m4/m4/make.patch b/packages/m4/m4/make.patch
deleted file mode 100644
index 3577b0b7db..0000000000
--- a/packages/m4/m4/make.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
---- m4-1.4.2/doc/Makefile.in~make
-+++ m4-1.4.2/doc/Makefile.in
-@@ -57,9 +57,9 @@
- date > $(srcdir)/stamp-vti
-
- install: all
-- $(srcdir)/../mkinstalldirs $(infodir)
-+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(infodir)
- cd $(srcdir) && for file in m4.info*; do \
-- $(INSTALL_DATA) $$file $(infodir)/$$file; \
-+ $(INSTALL_DATA) $$file $(DESTDIR)$(infodir)/$$file; \
- done
-
- uninstall:
---- m4-1.4.2/src/Makefile.in~make
-+++ m4-1.4.2/src/Makefile.in
-@@ -35,7 +35,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- transform = @program_transform_name@
--bindir = $(exec_prefix)/bin
-+bindir = @bindir@
-
- COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
- LINK = $(CC) $(LDFLAGS) -o $@
-@@ -84,8 +84,8 @@
- $(LINK) ansi2knr.o $(LIBS)
-
- install: all
-- $(srcdir)/../mkinstalldirs $(bindir)
-- $(INSTALL_PROGRAM) m4 $(bindir)/`echo m4 | sed '$(transform)'`
-+ $(srcdir)/../mkinstalldirs $(DESTDIR)$(bindir)
-+ $(INSTALL_PROGRAM) m4 $(DESTDIR)$(bindir)/`echo m4 | sed '$(transform)'`
-
- uninstall:
- rm -f $(bindir)/`echo m4 | sed '$(transform)'`
diff --git a/packages/m4/m4_1.4.2.bb b/packages/m4/m4_1.4.4.bb
index 05a9b5b0a5..0c9f4c38ac 100644
--- a/packages/m4/m4_1.4.2.bb
+++ b/packages/m4/m4_1.4.4.bb
@@ -1,8 +1,7 @@
DESCRIPTION = "GNU m4 is an implementation of the traditional Unix macro \
processor."
LICENSE = "GPL"
-SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz \
- file://make.patch;patch=1"
+SRC_URI = "${GNU_MIRROR}/m4/m4-${PV}.tar.gz"
S = "${WORKDIR}/m4-${PV}"
inherit autotools