From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/esound/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/esound/Makefile') diff --git a/package/esound/Makefile b/package/esound/Makefile index 20a06621f..02c72fec9 100644 --- a/package/esound/Makefile +++ b/package/esound/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.2.41 PKG_RELEASE:= 8 PKG_MD5SUM:= 3d8973ed87053d7acc1f4d44af2c4688 PKG_DESCR:= enlightened sound daemon -PKG_SECTION:= multimedia +PKG_SECTION:= mm/audio PKG_DEPENDS:= libaudiofile libesd PKG_BUILDDEP:= libaudiofile autotool PKG_URL:= http://www.tux.org/~ricdude/EsounD.html @@ -19,8 +19,8 @@ PKG_OPTS:= dev DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SUBPKGS:= ESOUND LIBESD -PKGSC_LIBESD:= libs -PKGSD_LIBESD:= Esound library +PKGSC_LIBESD:= libs/audio +PKGSD_LIBESD:= esound library ifeq ($(ADK_STATIC),y) PKG_OPTS+= libmix -- cgit v1.2.3