diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:15:39 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-24 20:15:39 +0200 |
commit | 57f1ccba214ee4d658fe2bcd61ef51651ade3225 (patch) | |
tree | b18a2c5f6d6fc42a9228daa4cf671f517e5a4a43 /package/exmap | |
parent | f3e84309257b915cb8820917a8dd5578f02fe974 (diff) | |
parent | 6f63961c83bdb1791779975a36ebd28a0de247d6 (diff) |
Merge branch 'master' of ssh://openadk.org/git/openadk
fic conflicts
Conflicts:
package/gnutls/Makefile
package/mrd6/Makefile
Diffstat (limited to 'package/exmap')
-rw-r--r-- | package/exmap/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/exmap/Makefile b/package/exmap/Makefile index 78f0cf13e..c515e4573 100644 --- a/package/exmap/Makefile +++ b/package/exmap/Makefile @@ -16,10 +16,10 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-console-${PKG_VERSION} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},${ARCH},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) +$(eval $(call PKG_template,EXMAP,exmap,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,EXMAPD,exmapd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,EXMAPSERVER,exmapserver,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,KMOD_EXMAP,kmod-exmap,${KERNEL_VERSION}+${PKG_VERSION}-${DEVICE}-${PKG_RELEASE},kernel (${KERNEL_VERSION}-${DEVICE}-${KERNEL_RELEASE}))) CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --disable-doc |