diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-08 13:24:26 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-08 13:24:26 +0100 |
| commit | f2b154b7d74e21b7e655c6cd121155592c1bee03 (patch) | |
| tree | d1d8f06abeb89834cebb70d33229aff129b9d485 /package/libvorbis | |
| parent | c93c25a63b3b5a29a258460519ed36341da2e79e (diff) | |
| parent | 63e65ec30b763d6687d462c52cb46bd5e738928a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libvorbis')
| -rw-r--r-- | package/libvorbis/Makefile | 8 | ||||
| -rw-r--r-- | package/libvorbis/patches/autotool.patch | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile index 05e01dd94..0c301c634 100644 --- a/package/libvorbis/Makefile +++ b/package/libvorbis/Makefile @@ -28,14 +28,14 @@ CONFIGURE_ARGS+= --with-ogg="${STAGING_TARGET_DIR}/usr" \ --with-ogg-includes="${STAGING_TARGET_DIR}/usr/include" \ --with-ogg-libraries="${STAGING_TARGET_DIR}/usr/lib" -post-install: +libvorbis-install: ${INSTALL_DIR} ${IDIR_LIBVORBIS}/usr/lib - ${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib/ - ${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libvorbis.so* ${IDIR_LIBVORBIS}/usr/lib + ${CP} ${WRKINST}/usr/lib/libvorbisfile.so* ${IDIR_LIBVORBIS}/usr/lib libvorbisenc-install: ${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib - ${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib libvorbis-dev-install: ${INSTALL_DIR} ${IDIR_LIBVORBIS_DEV}/usr/include/vorbis diff --git a/package/libvorbis/patches/autotool.patch b/package/libvorbis/patches/autotool.patch index d8e63a67e..4df8d7d80 100644 --- a/package/libvorbis/patches/autotool.patch +++ b/package/libvorbis/patches/autotool.patch @@ -63514,7 +63514,7 @@ diff -Nur libvorbis-1.2.0.orig/Makefile.am libvorbis-1.2.0/Makefile.am AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2 -SUBDIRS = lib include doc examples vq -+SUBDIRS = lib include doc vq ++SUBDIRS = lib include vq m4datadir = $(datadir)/aclocal m4data_DATA = vorbis.m4 @@ -63715,7 +63715,7 @@ diff -Nur libvorbis-1.2.0.orig/Makefile.in libvorbis-1.2.0/Makefile.in top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2 -SUBDIRS = lib include doc examples vq -+SUBDIRS = lib include doc vq ++SUBDIRS = lib include vq m4datadir = $(datadir)/aclocal m4data_DATA = vorbis.m4 pkgconfigdir = $(libdir)/pkgconfig |