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/gsm | |
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/gsm')
-rw-r--r-- | package/gsm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/gsm/Makefile b/package/gsm/Makefile index 27dad9eb1..c0ceafeb0 100644 --- a/package/gsm/Makefile +++ b/package/gsm/Makefile @@ -14,8 +14,8 @@ WRKDIST= ${WRKDIR}/${PKG_NAME}-1.0-pl10 include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) -$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) +$(eval $(call PKG_template,LIBGSM,libgsm,${PKG_VERSION}-${PKG_RELEASE})) +$(eval $(call PKG_template,GSM_UTILS,gsm-utils,${PKG_VERSION}-${PKG_RELEASE})) XAKE_FLAGS+= COPTS="${TARGET_CFLAGS}" \ INSTALL_ROOT="${WRKINST}" |