summaryrefslogtreecommitdiff
path: root/package/libvorbis/Makefile
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-18 18:10:19 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-18 18:10:19 +0100
commit46b2bb3001ce838ba2483a08418587d8a027f3a9 (patch)
treeb2b618839b5afcc859fcb90556e6f199d9a9a10c /package/libvorbis/Makefile
parent88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff)
parent902ee7e7b23751ca7a8264d36a837aa4aae12032 (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libvorbis/Makefile')
-rw-r--r--package/libvorbis/Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/package/libvorbis/Makefile b/package/libvorbis/Makefile
index 484ffa867..a980c64a7 100644
--- a/package/libvorbis/Makefile
+++ b/package/libvorbis/Makefile
@@ -23,19 +23,17 @@ $(eval $(call PKG_template,LIBVORBIS,libvorbis,${PKG_VERSION}-${PKG_RELEASE},${P
$(eval $(call PKG_template,LIBVORBISENC,libvorbisenc,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
$(eval $(call PKG_template,LIBVORBIS_DEV,libvorbis-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBVORBIS_DEV},${PKGSC_LIBVORBIS_DEV}))
-SUB_INSTALLS-y:=
-SUB_INSTALLS-m:=
-SUB_INSTALLS-${ADK_PACKAGE_LIBVORBIS_DEV}+= libvorbis-dev-install
-
CONFIGURE_ENV+= LIBS="-lm -logg"
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: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y}
+post-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/
+
+libvorbisenc-install:
${INSTALL_DIR} ${IDIR_LIBVORBISENC}/usr/lib
${CP} ${WRKINST}/usr/lib/libvorbisenc.so* ${IDIR_LIBVORBISENC}/usr/lib/