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/olsrd | |
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/olsrd')
-rw-r--r-- | package/olsrd/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/package/olsrd/Makefile b/package/olsrd/Makefile index 51e512463..2fc229e90 100644 --- a/package/olsrd/Makefile +++ b/package/olsrd/Makefile @@ -23,11 +23,11 @@ ${2}-install: endef -$(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,OLSRD,olsrd,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OLSRD_MOD_DYN_GW,olsrd-mod-dyn-gw,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OLSRD_MOD_HTTPINFO,olsrd-mod-httpinfo,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OLSRD_MOD_NAMESERVICE,olsrd-mod-nameservice,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,OLSRD_MOD_TAS,olsrd-mod-tas,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_mod_template,OLSRD_MOD_DYN_GW,dyn_gw)) $(eval $(call PKG_mod_template,OLSRD_MOD_HTTPINFO,httpinfo)) |