Skip to content

Commit 1c796dd

Browse files
committed
Add realtime script path to configure.ac
There is no other path yet to this location when building debian package
1 parent 0871048 commit 1c796dd

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

src/configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -752,6 +752,7 @@ AC_DEFINE_UNQUOTED([EMC2_LANG_DIR], "$EMC2_LANG_DIR", [Directory for tcl transla
752752
AC_DEFINE_UNQUOTED([EMC2_PO_DIR], "$EMC2_PO_DIR", [Directory for po/mo translation files])
753753
AC_DEFINE_UNQUOTED([EMC2_NCFILES_DIR], "$EMC2_NCFILES_DIR", [Directory for nc files])
754754
AC_DEFINE_UNQUOTED([EMC2_IMAGE_DIR], "$EMC2_IMAGE_DIR", [Directory for images])
755+
AC_DEFINE_UNQUOTED([EMC2_REALTIME], "$REALTIME", [Path of realtime script])
755756

756757
AC_SUBST([EMC2_TMP_DIR])
757758
AC_SUBST([EMC2_BIN_DIR])

src/hal/halmodule.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <rtapi_mutex.h>
2828
#include "hal.h"
2929
#include "hal_priv.h"
30+
#include "config.h"
3031

3132
#define EXCEPTION_IF_NOT_LIVE(retval) do { \
3233
if(self->hal_id <= 0) { \
@@ -2403,7 +2404,7 @@ PyMODINIT_FUNC PyInit__hal(void)
24032404

24042405
//Call realtime verify to gather realtime status
24052406
//Most probably we don't have realtime running yet
2406-
int ret = system("realtime verify > /dev/null");
2407+
int ret = system(EMC2_REALTIME " verify > /dev/null");
24072408
int exit_stat = WEXITSTATUS(ret);
24082409
if(exit_stat != 0 && exit_stat != 1){
24092410
PyErr_Format(PyExc_RuntimeError, "realtime verify failed, system() return value %i / exit %i", ret, exit_stat);

0 commit comments

Comments
 (0)