master
Marc Wäckerlin 7 years ago
parent 7e8b3a6d7e
commit f69dd88030
  1. 1
      scripts/ax_init_standard_project.m4
  2. 2
      scripts/bootstrap.sh

@ -943,7 +943,6 @@ AC_DEFUN([AX_PKG_CHECK], [
(test -x /usr/sbin/urpmq && urpmq "$rpm_pkg" 1>&2 > /dev/null); then (test -x /usr/sbin/urpmq && urpmq "$rpm_pkg" 1>&2 > /dev/null); then
AX_RPM_BUILD_DEPEND([$rpm_pkg]) AX_RPM_BUILD_DEPEND([$rpm_pkg])
fi fi
)
]) ])
# make sure, a specific header exists # make sure, a specific header exists

@ -1101,7 +1101,7 @@ to --condition AX_USE_NODEJS nodejs/etc/${PACKAGE_NAME}.json <<EOF
} }
} }
EOF EOF
PACKAGE_NAME_UPPER=$(echo ${PACKAGE_NAME} | tr '+[:lower:]' 'X[:upper:]' | tr -cd '[[:alnum:]]_-.') PACKAGE_NAME_UPPER=$(echo ${PACKAGE_NAME} | tr '+[:lower:]' 'X[:upper:]' | tr -cd '[[:alnum:]]._-')
to --condition AX_USE_NODEJS nodejs/etc/default/${PACKAGE_NAME} <<EOF to --condition AX_USE_NODEJS nodejs/etc/default/${PACKAGE_NAME} <<EOF
#EXEC_${PACKAGE_NAME_UPPER}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}" #EXEC_${PACKAGE_NAME_UPPER}="/usr/bin/nodejs /usr/share/${PACKAGE_NAME}/nodejs/${PACKAGE_NAME}"
#${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log" #${PACKAGE_NAME_UPPER}_LOG="/var/log/${PACKAGE_NAME}.log"

Loading…
Cancel
Save