From 43fce34123c4ddc4e9a07692a08eb400f784141d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Wed, 25 Nov 2015 12:45:18 +0000 Subject: [PATCH] install cordova from ubuntu ppa --- configure.ac | 9 --------- debian/control.in | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index 8549656..c3e0009 100644 --- a/configure.ac +++ b/configure.ac @@ -34,15 +34,6 @@ AC_PATH_PROG(ANDROID, [android], [0], [${PATH}${PATH_SEPARATOR}${ANDROID_HOME}/tools]) AC_PATH_PROG(CORDOVA, [cordova], [0], [${PATH}${PATH_SEPARATOR}$(pwd)/node_modules/cordova/bin]) -if test ${CORDOVA} = 0; then - AC_CHECK_PROG(NODE_NPM, [npm node], [1], [0]) - if test ${NODE_NPM} -eq 1; then - if npm install cordova; then - AC_PATH_PROG(CORDOVA, [cordova], [0], - [${PATH}${PATH_SEPARATOR}$(pwd)/node_modules/cordova/bin]) - fi - fi -fi AM_CONDITIONAL(HAVE_CORDOVA, [test ${CORDOVA} != 0 -a ${ANDROID} != 0]) AX_SUBST(CORDOVA) diff --git a/debian/control.in b/debian/control.in index bfae6fa..f3c744c 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,7 +1,7 @@ Source: @PACKAGE_NAME@ Priority: extra Maintainer: @AUTHOR@ -Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release, doxygen, graphviz, mscgen, npm, node +Build-Depends: debhelper, subversion, pkg-config, automake, libtool, autotools-dev, lsb-release, doxygen, graphviz, mscgen, cordova-cli Package: @PACKAGE_NAME@ Section: web