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/miredo | |
| parent | 365261c9db442081290b7d21aba6201244af294d (diff) | |
resolve merge conflict
Diffstat (limited to 'package/miredo')
| -rw-r--r-- | package/miredo/Makefile | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/package/miredo/Makefile b/package/miredo/Makefile index f63354fbe..707d9088f 100644 --- a/package/miredo/Makefile +++ b/package/miredo/Makefile @@ -7,18 +7,20 @@ PKG_NAME:= miredo PKG_VERSION:= 1.2.6 PKG_RELEASE:= 2 PKG_MD5SUM:= 5bcdbaced54f40b6cb1e9c9a8dbac411 -PKG_DESCR:= A Teredo client and relay daemon -PKG_SECTION:= ipv6 +PKG_DESCR:= teredo application +PKG_SECTION:= net/ipv6 PKG_BUILDDEP:= autotool PKG_URL:= http://www.remlab.net/ PKG_SITES:= http://www.remlab.net/files/miredo/ -PKG_SUBPKGS:= MIREDO MIREDO_SERVER +PKG_SUBPKGS:= MIREDO_CLIENT MIREDO_SERVER +PKGSD_MIREDO_CLIENT:= teredo client +PKGSD_MIREDO_SERVER:= teredo relay daemon include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,MIREDO,miredo,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,MIREDO_CLIENT,miredo-client,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MIREDO_CLIENT},${PKG_SECTION})) +$(eval $(call PKG_template,MIREDO_SERVER,miredo-server,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_MIREDO_SERVER},${PKG_SECTION})) AUTOTOOL_STYLE:= autoreconf TARGET_CFLAGS+= -std=gnu99 @@ -28,16 +30,16 @@ CONFIGURE_ARGS+= --without-Judy \ --enable-teredo-client \ --enable-miredo-user=root -XAKE_FLAGS+= CXXLINK="\$${LINK}" \ +XAKE_FLAGS+= CXXLINK="\$${LINK}" -miredo-install: - ${INSTALL_DIR} ${IDIR_MIREDO}/etc/miredo ${IDIR_MIREDO}/usr/sbin - ${INSTALL_DIR} ${IDIR_MIREDO}/usr/lib +miredo-client-install: + ${INSTALL_DIR} ${IDIR_MIREDO_CLIENT}/etc/miredo ${IDIR_MIREDO_CLIENT}/usr/sbin + ${INSTALL_DIR} ${IDIR_MIREDO_CLIENT}/usr/lib ${INSTALL_DATA} ${WRKINST}/etc/miredo/miredo.conf \ - ${IDIR_MIREDO}/etc/miredo - ${CP} ${WRKINST}/usr/lib/libtun*.so* ${IDIR_MIREDO}/usr/lib - ${CP} ${WRKINST}/usr/lib/libteredo.so* ${IDIR_MIREDO}/usr/lib - ${INSTALL_BIN} ${WRKINST}/usr/sbin/miredo ${IDIR_MIREDO}/usr/sbin/ + ${IDIR_MIREDO_CLIENT}/etc/miredo + ${CP} ${WRKINST}/usr/lib/libtun*.so* ${IDIR_MIREDO_CLIENT}/usr/lib + ${CP} ${WRKINST}/usr/lib/libteredo.so* ${IDIR_MIREDO_CLIENT}/usr/lib + ${INSTALL_BIN} ${WRKINST}/usr/sbin/miredo ${IDIR_MIREDO_CLIENT}/usr/sbin/ miredo-server-install: ${INSTALL_DIR} ${IDIR_MIREDO_SERVER}/usr/sbin |