diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 23:40:31 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-02-26 23:40:31 +0100 |
| commit | a4137f916eed4e87434e5382573008c89c8f1652 (patch) | |
| tree | 3ddb4c0a6eda021657996e9d309e5080df83ad63 /package/libvorbis/patches/patch-Makefile_in | |
| parent | 26f7c999e7c586eeb0eabeaf34ebbc9b3c145d7c (diff) | |
| parent | 27537f0ac386cd2d869a73d2c4d432be2dffb9eb (diff) | |
resolve merge problems
Diffstat (limited to 'package/libvorbis/patches/patch-Makefile_in')
| -rw-r--r-- | package/libvorbis/patches/patch-Makefile_in | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/package/libvorbis/patches/patch-Makefile_in b/package/libvorbis/patches/patch-Makefile_in deleted file mode 100644 index 51c885573..000000000 --- a/package/libvorbis/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id$ ---- libvorbis-1.2.0.orig/Makefile.in 2007-07-25 16:46:36.000000000 +0000 -+++ libvorbis-1.2.0/Makefile.in 2007-10-11 09:22:14.000000000 +0000 -@@ -221,7 +221,7 @@ target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2 --SUBDIRS = lib include doc examples vq -+SUBDIRS = lib include doc vq - m4datadir = $(datadir)/aclocal - m4data_DATA = vorbis.m4 - pkgconfigdir = $(libdir)/pkgconfig |