diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-25 20:18:11 +0100 |
| commit | 29486d09fc74ca557f97136ac852767e48a981f2 (patch) | |
| tree | 7ea4c6a266b67fd2e87c0b8ed6d6df798b5b637b /package/bison/patches/patch-Makefile_in | |
| parent | e473446ff8a93fb8cdc52494b4d6ee15bc15bf61 (diff) | |
| parent | 92de2ee1c2848fe50b9908bb679e0c9edcd4a867 (diff) | |
resolve merge conflict
Diffstat (limited to 'package/bison/patches/patch-Makefile_in')
| -rw-r--r-- | package/bison/patches/patch-Makefile_in | 11 |
1 files changed, 11 insertions, 0 deletions
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 \ |