diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/bison | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/bison')
| -rw-r--r-- | package/bison/Config.in | 6 | ||||
| -rw-r--r-- | package/bison/Makefile | 4 | ||||
| -rw-r--r-- | package/bison/patches/patch-Makefile_in | 11 | ||||
| -rw-r--r-- | package/bison/patches/patch-lib_config_hin | 12 |
4 files changed, 23 insertions, 10 deletions
diff --git a/package/bison/Config.in b/package/bison/Config.in deleted file mode 100644 index a78712f64..000000000 --- a/package/bison/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config ADK_PACKAGE_BISON - prompt "bison.............................. GNU parser generator" - tristate - default n - help - http://www.gnu.org/software/bison/ diff --git a/package/bison/Makefile b/package/bison/Makefile index 7c742fe6e..4c36f5892 100644 --- a/package/bison/Makefile +++ b/package/bison/Makefile @@ -16,10 +16,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,BISON,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu -BUILD_STYLE:= auto -INSTALL_STYLE:= auto - post-install: ${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison ${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin diff --git a/package/bison/patches/patch-Makefile_in b/package/bison/patches/patch-Makefile_in new file mode 100644 index 000000000..19d01c699 --- /dev/null +++ b/package/bison/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- bison-2.4.1.orig/Makefile.in 2008-12-11 23:05:53.000000000 +0100 ++++ bison-2.4.1/Makefile.in 2010-02-23 20:11:17.748535777 +0100 +@@ -502,7 +502,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + ACLOCAL_AMFLAGS = -I m4 +-SUBDIRS = build-aux po runtime-po lib data src doc examples tests etc ++SUBDIRS = build-aux po runtime-po lib data src etc + aclocal_DATA = m4/bison-i18n.m4 + EXTRA_DIST = .prev-version .version cfg.mk maint.mk \ + OChangeLog PACKAGING \ diff --git a/package/bison/patches/patch-lib_config_hin b/package/bison/patches/patch-lib_config_hin new file mode 100644 index 000000000..dde4f8ee0 --- /dev/null +++ b/package/bison/patches/patch-lib_config_hin @@ -0,0 +1,12 @@ +--- bison-2.4.1.orig/lib/config.hin 2008-12-11 23:05:52.000000000 +0100 ++++ bison-2.4.1/lib/config.hin 2010-02-23 20:09:49.477285615 +0100 +@@ -399,6 +399,9 @@ + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + ++/* Define to the home page for this package. */ ++#undef PACKAGE_URL ++ + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + |