summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-01 11:01:46 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-01 11:01:46 +0000
commit116e25e86d185b4ee549e98baf09006d40ef055a (patch)
treecd84c66be451561d33c5224aff2918996f1cfd4c /meta
parentbe2a5dfc212b9333a683efd20173a8b878c41d4b (diff)
downloadpoky-116e25e86d185b4ee549e98baf09006d40ef055a.tar.gz
bzip2: Fix double defintion problem which breaks recent autoconf/automake
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/bzip2/bzip2-1.0.5/Makefile.am2
-rw-r--r--meta/packages/bzip2/bzip2_1.0.5.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/packages/bzip2/bzip2-1.0.5/Makefile.am b/meta/packages/bzip2/bzip2-1.0.5/Makefile.am
index b234e80f37..070d57b243 100644
--- a/meta/packages/bzip2/bzip2-1.0.5/Makefile.am
+++ b/meta/packages/bzip2/bzip2-1.0.5/Makefile.am
@@ -21,7 +21,7 @@ bzip2recover_SOURCES = bzip2recover.c
21bzip2recover_LDADD = libbz2.la 21bzip2recover_LDADD = libbz2.la
22bzip2recover_DEPENDENCIES = libbz2.la 22bzip2recover_DEPENDENCIES = libbz2.la
23 23
24bin_SCRIPTS = bzgrep bzgrep bzmore bzdiff 24bin_SCRIPTS = bzgrep bzmore bzdiff
25 25
26man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1 26man_MANS = bzip2.1 bzgrep.1 bzmore.1 bzdiff.1
27EXTRA_DIST = $(man_MANS) 27EXTRA_DIST = $(man_MANS)
diff --git a/meta/packages/bzip2/bzip2_1.0.5.bb b/meta/packages/bzip2/bzip2_1.0.5.bb
index 2b57a2e14f..e9c66c30a3 100644
--- a/meta/packages/bzip2/bzip2_1.0.5.bb
+++ b/meta/packages/bzip2/bzip2_1.0.5.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "Very high-quality data compression program." 1DESCRIPTION = "Very high-quality data compression program."
2SECTION = "console/utils" 2SECTION = "console/utils"
3PR = "r0" 3PR = "r1"
4 4
5LICENSE = "bzip2" 5LICENSE = "bzip2"
6SRC_URI = "http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz \ 6SRC_URI = "http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz \