diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
| commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
| tree | 7617315e619f969c13e79c1f44c2428871719357 /package/avahi/Makefile | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/avahi/Makefile')
| -rw-r--r-- | package/avahi/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/package/avahi/Makefile b/package/avahi/Makefile index 453555e90..99687297c 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= avahi PKG_VERSION:= 0.6.31 PKG_RELEASE:= 3 PKG_MD5SUM:= 2f22745b8f7368ad5a0a3fddac343f2d -PKG_DESCR:= mDNS daemon -PKG_SECTION:= dhcp +PKG_DESCR:= multicast dns daemon +PKG_SECTION:= net/dns PKG_DEPENDS:= libstdcxx PKG_BUILDDEP:= autotool libdaemon expat gdbm glib PKG_BUILDDEP+= gettext-tiny gtk+ dbus @@ -24,7 +24,7 @@ PKGSS_AVAHI_DAEMON:= libavahi libdaemon libexpat libintl libgtk dbus PKGSS_AVAHI_DNSCONFD:= libavahi libdaemon avahi-daemon PKGSD_AVAHI_DNSCONFD:= DNS server from mDNS configuration daemon PKGSD_LIBAVAHI:= DNS-SD over mDNS library -PKGSC_LIBAVAHI:= libs +PKGSC_LIBAVAHI:= libs/misc ifeq ($(ADK_STATIC),y) PKG_OPTS+= libmix |