diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /package/gmediaserver | |
parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to 'package/gmediaserver')
-rw-r--r-- | package/gmediaserver/Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/package/gmediaserver/Makefile b/package/gmediaserver/Makefile index eb38904cd..11b830abe 100644 --- a/package/gmediaserver/Makefile +++ b/package/gmediaserver/Makefile @@ -6,11 +6,11 @@ include ${TOPDIR}/rules.mk PKG_NAME:= gmediaserver PKG_VERSION:= 0.13.0 PKG_RELEASE:= 1 -PKG_BUILDDEP+= id3lib libupnp PKG_MD5SUM:= c422de386331e2a1a859d45f6fa270a3 PKG_DESCR:= An UPnP music media server PKG_SECTION:= net PKG_DEPENDS:= id3lib libupnp +PKG_BUILDDEP+= id3lib libupnp PKG_URL:= http://www.gnu.org/software/gmediaserver PKG_SITES:= http://savannah.nongnu.org/download/gmediaserver/ @@ -18,13 +18,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GMEDIASERVER,gmediaserver,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE= gnu CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -lz" \ am_cv_func_iconv=no CONFIGURE_ARGS+= --with-id3lib="${STAGING_DIR}/usr" \ --with-libupnp="${STAGING_DIR}/usr" -BUILD_STYLE= auto -INSTALL_STYLE= auto ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y) CONFIGURE_ENV+= LIBS=" -lixml -lthreadutil -lupnp -luClibc++ -lz" @@ -32,6 +29,7 @@ endif post-install: ${INSTALL_DIR} ${IDIR_GMEDIASERVER}/usr/sbin - ${INSTALL_BIN} ${WRKINST}/usr/bin/gmediaserver ${IDIR_GMEDIASERVER}/usr/sbin/ + ${INSTALL_BIN} ${WRKINST}/usr/bin/gmediaserver \ + ${IDIR_GMEDIASERVER}/usr/sbin/ include ${TOPDIR}/mk/pkg-bottom.mk |