fix headless support

docs/src/Submakefile

@@ -1381,7 +1381,9 @@ clean:
 endif
 
 manpages: $(GENERATED_MANPAGES)
+ifeq ($(BUILD_MANPAGES),yes)
 TARGETS += manpages
+endif
 
 # make manpages from all the asciidoc manpage-sources
 GENERATED_MANPAGES += $(patsubst $(DOC_DIR)/src/man/%.adoc, $(DOC_MAN)/%, $(wildcard $(DOC_DIR)/src/man/man?/*.adoc))

scripts/linuxcnc.in

@@ -987,8 +987,15 @@ case $EMCDISPLAY in
     echo "DUMMY DISPLAY MODULE, press <ENTER> to continue."
     read -r ;
   ;;
+
   linuxcncrsh)
+    if ! program_available "$EMCDISPLAY"; then
+      echo "Can't execute DISPLAY program $EMCDISPLAY ${EMCDISPLAYARGS[*]} ${EXTRA_ARGS[*]}"
+      Cleanup
+      exit 1
+    fi
     $EMCDISPLAY "${EMCDISPLAYARGS[@]}" "${EXTRA_ARGS[@]}" -- -ini "$INIFILE"
+    result=$?
   ;;
   *)
     # all other displays are assumed to be commands on the PATH

src/Makefile

@@ -169,6 +169,12 @@ PYTARGETS :=
 GENERATED_MANPAGES :=
 
 # Submakefiles from each of these directories will be included if they exist
+ifeq ($(BUILD_GUI),yes)
+GUI_SUBDIRS := emc/usr_intf/touchy emc/usr_intf/stepconf emc/usr_intf/pncconf \
+    emc/usr_intf/gremlin emc/usr_intf/gscreen emc/usr_intf/pyui emc/usr_intf/qtvcp \
+    emc/usr_intf/gmoccapy emc/usr_intf/qtplasmac emc/usr_intf/mdro
+endif
+
 SUBDIRS := \
     libnml/linklist libnml/cms libnml/rcs libnml/os_intf \
     libnml/nml libnml/buffer libnml/posemath libnml \
@@ -184,10 +190,8 @@ SUBDIRS := \
     hal/user_comps/huanyang-vfd \
 	hal/user_comps/xhc-whb04b-6 \
     \
-    emc/usr_intf/axis emc/usr_intf/touchy emc/usr_intf/stepconf emc/usr_intf/pncconf \
-    emc/usr_intf/gremlin emc/usr_intf/gscreen emc/usr_intf/pyui emc/usr_intf/qtvcp \
-    emc/usr_intf/gmoccapy emc/usr_intf/qtplasmac emc/usr_intf/mdro\
-    emc/usr_intf emc/nml_intf emc/task emc/kinematics emc/tp emc/canterp \
+    $(GUI_SUBDIRS) \
+    emc/usr_intf/axis emc/usr_intf emc/nml_intf emc/task emc/kinematics emc/tp emc/canterp \
     emc/motion emc/ini emc/rs274ngc emc/sai emc/pythonplugin \
     emc/motion-logger \
     emc/tooldata \
@@ -482,7 +486,9 @@ TARGETS += ../bin/gremlin_view
 	$(Q)chmod +x $@
 
 # halshow as standalone app:
+ifeq ($(BUILD_GUI),yes)
 TARGETS += ../bin/halshow
+endif
 ../bin/halshow: Makefile
 	$(Q)rm -f $@
 	$(Q)(echo "#!$(TCLSH)")>|$@
@@ -681,10 +687,14 @@ install-dirs:
 		$(DESTDIR)$(datadir)/linuxcnc/hallib
 
 install-kernel-indep: install-dirs
-	$(FILE) ../docs/build/man/man1/*.1 $(DESTDIR)$(mandir)/man1
+ifeq ($(BUILD_MANPAGES),yes)
+	$(FILE) $(wildcard ../docs/build/man/man1/*.1) $(DESTDIR)$(mandir)/man1
 	$(FILE) $(wildcard ../docs/build/man/man3/*.3) $(DESTDIR)$(mandir)/man3
 	$(FILE) $(wildcard ../docs/build/man/man9/*.9) $(DESTDIR)$(mandir)/man9
+endif
+ifeq ($(BUILD_GUI),yes)
 	$(FILE) objects/*.msg $(DESTDIR)$(tcldir)/msgs
+endif
 	$(EXE) ../scripts/realtime $(DESTDIR)$(prefix)/lib/linuxcnc
 	$(EXE) ../scripts/halrun $(DESTDIR)$(bindir)
 	$(EXE) ../scripts/halcmd_twopass $(DESTDIR)$(bindir)
@@ -693,7 +703,9 @@ install-kernel-indep: install-dirs
 	$(EXE) ../scripts/sim_pin $(DESTDIR)$(bindir)
 	$(FILE) ../*.png ../*.gif $(DESTDIR)$(datadir)/linuxcnc
 	$(FILE) ../lib/hallib/*   $(DESTDIR)$(datadir)/linuxcnc/hallib
+ifeq ($(BUILD_GUI),yes)
 	$(FILE) ../tcl/*.png $(DESTDIR)$(tcldir)
+endif
 
 	# install all the sample configs, including subdirs (tar is required on debian systems, and common on others)
 	$(DIR) $(DESTDIR)$(sampleconfsdir)
@@ -724,15 +736,18 @@ install-kernel-indep: install-dirs
 	$(FILE) $(HEADERS) $(DESTDIR)$(includedir)/linuxcnc/
 	$(TREE) $(NC_FILES) $(DESTDIR)$(ncfilesdir)
 	$(EXE) ../nc_files/M101 $(DESTDIR)$(ncfilesdir)
-	$(FILE) ../tcl/TkLinuxCNC $(DESTDIR)/etc/X11/app-defaults
 	$(FILE) Makefile.modinc $(DESTDIR)$(datadir)/linuxcnc
+ifeq ($(BUILD_GUI),yes)
 	$(EXE) $(TCL) $(DESTDIR)$(tcldir)
+	$(FILE) ../tcl/TkLinuxCNC $(DESTDIR)/etc/X11/app-defaults
 	$(FILE) ../tcl/hal.so $(DESTDIR)$(tcldir)
 	$(FILE) ../tcl/linuxcnc.so $(DESTDIR)$(tcldir)
 	$(FILE) ../tcl/pkgIndex.tcl $(DESTDIR)$(tcldir)
 	$(EXE) $(TCL_BIN) $(DESTDIR)$(tcldir)/bin
 	$(FILE) ../tcl/scripts/balloon.tcl ../tcl/scripts/emchelp.tcl $(DESTDIR)$(tcldir)/scripts
 	$(EXE) ../tcl/scripts/Set_Coordinates.tcl $(DESTDIR)$(tcldir)/scripts
+endif
+ifeq ($(BUILD_GUI),yes)
 	$(FILE) ../share/linuxcnc/*.glade $(DESTDIR)$(prefix)/share/linuxcnc
 	$(FILE) ../share/linuxcnc/stepconf/*.glade $(DESTDIR)$(prefix)/share/linuxcnc/stepconf
 	$(FILE) ../share/linuxcnc/touchy.glade $(DESTDIR)$(prefix)/share/linuxcnc
@@ -742,22 +757,26 @@ install-kernel-indep: install-dirs
 	$(FILE) ../share/linuxcnc/pncconf/*.glade $(DESTDIR)$(prefix)/share/linuxcnc/pncconf
 	$(FILE) ../share/linuxcnc/gremlin_view.ui $(DESTDIR)$(prefix)/share/linuxcnc
 	$(FILE) ../share/linuxcnc/popupkeyboard.ui $(DESTDIR)$(prefix)/share/linuxcnc
+endif
 	$(FILE) ../configs/common/linuxcnc.nml     $(DESTDIR)$(prefix)/share/linuxcnc
 	$(FILE) ../configs/common/linuxcnc_big.nml $(DESTDIR)$(prefix)/share/linuxcnc
+ifeq ($(BUILD_GUI),yes)
 	$(FILE) ../src/emc/usr_intf/pncconf/pncconf-help/*.txt $(DESTDIR)$(prefix)/share/linuxcnc/pncconf/pncconf-help
 	$(FILE) ../src/emc/usr_intf/pncconf/pncconf-help/*.png $(DESTDIR)$(prefix)/share/linuxcnc/pncconf/pncconf-help
 
 	$(FILE) ../lib/python/gladevcp/hal_python.xml $(DESTDIR)$(datadir)/glade/catalogs/
 	$(FILE) ../share/glade/pixmaps/hicolor/22x22/actions/widget*.png  $(DESTDIR)$(datadir)/glade/pixmaps/hicolor/22x22/actions/
 
 	$(FILE) ../share/gtksourceview-4/language-specs/*.lang  $(DESTDIR)$(datadir)/gtksourceview-4/language-specs/
+endif
 
 	$(FILE) ../src/hal/drivers/mesa-hostmot2/modbus/*.tmpl  $(DESTDIR)$(prefix)/share/linuxcnc/
 
 install-kernel-indep: install-python
 install-python: install-dirs
 	$(DIR) $(DESTDIR)$(SITEPY) $(DESTDIR)$(SITEPY)/rs274
 	$(DIR) $(DESTDIR)$(SITEPY)/common
+ifeq ($(BUILD_GUI),yes)
 	$(DIR) $(DESTDIR)$(SITEPY)/touchy
 	$(DIR) $(DESTDIR)$(SITEPY)/gscreen
 	$(DIR) $(DESTDIR)$(SITEPY)/qtvcp
@@ -779,9 +798,11 @@ install-python: install-dirs
 	$(DIR) $(DESTDIR)$(SITEPY)/pncconf
 	$(DIR) $(DESTDIR)$(SITEPY)/pyui
 	$(DIR) $(DESTDIR)$(SITEPY)/plasmac
+endif
 	$(FILE) ../lib/python/*.py ../lib/python/*.so $(DESTDIR)$(SITEPY)
 	$(FILE) ../lib/python/common/*.py $(DESTDIR)$(SITEPY)/common
 	$(FILE) ../lib/python/rs274/*.py $(DESTDIR)$(SITEPY)/rs274
+ifeq ($(BUILD_GUI),yes)
 	$(FILE) ../lib/python/touchy/*.py $(DESTDIR)$(SITEPY)/touchy
 	$(FILE) ../lib/python/gscreen/*.py $(DESTDIR)$(SITEPY)/gscreen
 	$(FILE) ../lib/python/qtvcp/*.{py,ui,txt} $(DESTDIR)$(SITEPY)/qtvcp
@@ -799,41 +820,46 @@ install-python: install-dirs
 	$(EXE) ../bin/stepconf $(DESTDIR)$(bindir)
 	$(EXE) ../bin/pncconf $(DESTDIR)$(bindir)
 	$(EXE) ../bin/pyui $(DESTDIR)$(bindir)
+endif
 	$(EXE) ../bin/hal_input $(DESTDIR)$(bindir)
 	$(EXE) ../bin/hal_bridge $(DESTDIR)$(bindir)
 	$(EXE) ../bin/mitsub_vfd $(DESTDIR)$(bindir)
 	$(EXE) ../bin/mqtt-publisher $(DESTDIR)$(bindir)
 	$(EXE) ../bin/z_level_compensation $(DESTDIR)$(bindir)
 	$(EXE) ../bin/pmx485 $(DESTDIR)$(bindir)
 	$(EXE) ../bin/sim-torch $(DESTDIR)$(bindir)
-	$(EXE) ../bin/pyvcp $(DESTDIR)$(bindir)
-	$(EXE) ../bin/gladevcp $(DESTDIR)$(bindir)
-	$(EXE) ../bin/axis $(DESTDIR)$(bindir)
-	$(EXE) ../bin/axis-remote $(DESTDIR)$(bindir)
 	$(EXE) ../bin/debuglevel $(DESTDIR)$(bindir)
 	$(EXE) ../bin/linuxcnctop $(DESTDIR)$(bindir)
 	$(EXE) ../bin/mdi $(DESTDIR)$(bindir)
+ifeq ($(BUILD_GUI),yes)
 	$(EXE) ../bin/hal_manualtoolchange $(DESTDIR)$(bindir)
+	$(EXE) ../bin/axis-remote $(DESTDIR)$(bindir)
+	$(EXE) ../bin/pyvcp $(DESTDIR)$(bindir)
+	$(EXE) ../bin/gladevcp $(DESTDIR)$(bindir)
+	$(EXE) ../bin/axis $(DESTDIR)$(bindir)
 	$(EXE) ../bin/image-to-gcode $(DESTDIR)$(bindir)
 	$(EXE) ../bin/touchy $(DESTDIR)$(bindir)
 	$(EXE) ../bin/gscreen $(DESTDIR)$(bindir)
 	$(EXE) ../bin/qtvcp $(DESTDIR)$(bindir)
 	$(EXE) ../lib/python/qtvcp/designer/install_script $(DESTDIR)$(SITEPY)/qtvcp/designer/
 	$(EXE) ../bin/gmoccapy $(DESTDIR)$(bindir)
 	$(EXE) ../bin/teach-in $(DESTDIR)$(bindir)
-	$(EXE) ../bin/scorbot-er-3 $(DESTDIR)$(bindir)
 	$(EXE) $(patsubst %.py,../bin/%,$(VISMACH_PY)) $(DESTDIR)$(bindir)
 	$(EXE) $(patsubst %.py,../bin/%,$(QTPLASMAC_PY)) $(DESTDIR)$(bindir)
 	$(FILE) ../share/linuxcnc/linuxcnc-wizard.gif $(DESTDIR)$(prefix)/share/linuxcnc
 	$(FILE) ../share/axis/images/*.{png,gif,xbm,ngc} $(DESTDIR)$(datadir)/axis/images
 	$(FILE) ../share/axis/tcl/*.tcl $(DESTDIR)$(datadir)/axis/tcl
+endif
+	$(EXE) ../bin/scorbot-er-3 $(DESTDIR)$(bindir)
+ifeq ($(BUILD_GUI),yes)
 	$(FILE) ../share/gscreen/images/*.gif $(DESTDIR)$(datadir)/gscreen/images
 	$(TREE) ../share/gscreen/skins/* $(DESTDIR)$(datadir)/gscreen/skins
 	$(TREE) ../share/qtvcp/images/* $(DESTDIR)$(datadir)/qtvcp/images
 	$(TREE) ../share/qtvcp/screens/* $(DESTDIR)$(datadir)/qtvcp/screens
 	$(TREE) ../share/qtvcp/panels/* $(DESTDIR)$(datadir)/qtvcp/panels
 	$(TREE) ../share/qtvcp/widgets_ui/* $(DESTDIR)$(datadir)/qtvcp/widgets_ui
 	$(TREE) ../share/gmoccapy/icons/* $(DESTDIR)$(datadir)/gmoccapy/icons
+endif
 
 install-kernel-dep:
 	$(DIR)	$(DESTDIR)$(moduledir)/linuxcnc \

src/Makefile.inc.in

@@ -80,6 +80,7 @@ RTFLAGS := -I. -I@RTDIR@/include $(RTFLAGS) -DRTAPI -D_GNU_SOURCE -Drealtime
 ULFLAGS = -Wall -g -I. -I@RTDIR@/include -DULAPI -D_GNU_SOURCE -O2 -DLOCALE_DIR=\"$(localedir)\" -DPACKAGE=\"$(package)\"
 MODULE_EXT = @MODEXT@
 BUILD_SYS = @BUILD_SYS@
+BUILD_GUI = @BUILD_GUI@
 CC = @CC@
 MANDB = @MANDB@
 HIDRAW_H_USABLE = @HIDRAW_H_USABLE@
@@ -123,6 +124,7 @@ XGETTEXT = @XGETTEXT@
 LIBDL = @LIBDL@
 YAPPS = @YAPPS@
 
+BUILD_MANPAGES = @BUILD_MANPAGES@
 BUILD_DOCS = @BUILD_DOCS@
 BUILD_DOCS_PDF = @BUILD_DOCS_PDF@
 BUILD_DOCS_HTML = @BUILD_DOCS_HTML@

src/configure.ac

@@ -696,7 +696,13 @@ AC_ARG_WITH([tcl-dir],
     [EMC2_TCL_DIR="$withval"],
     [TCL_GET_DIR=$(echo [['set d [lindex [lsearch -all -inline -glob $tcl_pkgPath /usr/share/*] 0]; if {$d eq ""} {set d [lindex [lsearch -all -inline -glob $tcl_pkgPath /usr/lib*] 0]}; puts $d']] | tclsh 2>/dev/null)
      AS_IF([test -z "$TCL_GET_DIR"],
-           [AC_MSG_ERROR([could not determine Tcl package dir from tcl_pkgPath])])
+           [
+            if test "$BUILD_GUI" = "yes"; then
+                AC_MSG_ERROR([could not determine Tcl package dir from tcl_pkgPath])
+            else
+                TCL_GET_DIR="${libdir}/tcltk"
+            fi
+           ])
      EMC2_TCL_DIR="$TCL_GET_DIR/linuxcnc"])
 
 fe () {
@@ -810,6 +816,12 @@ else
 fi
 
 
+AC_ARG_ENABLE(gui,
+    AS_HELP_STRING([--disable-gui], [Disable building graphical user interfaces (Tk, Tcl, X11, Xinerama, GTK)]),
+    [BUILD_GUI=$enableval],
+    [BUILD_GUI=yes])
+AC_SUBST([BUILD_GUI])
+
 AC_ARG_ENABLE(gtk,
     AS_HELP_STRING(
         [--disable-gtk],
@@ -823,7 +835,7 @@ AC_ARG_ENABLE(gtk,
 	    BUILD_GTK=no ;;
 	esac
     ],
-    [BUILD_GTK=yes])
+    [BUILD_GTK=$BUILD_GUI])
 
 if test "$BUILD_GTK" = "yes"; then
   AC_MSG_CHECKING([for GTK 3.22.4 or above])
@@ -937,7 +949,7 @@ AC_SUBST(YAPPS)
 AC_PATH_PROG(MANDB, mandb, "")
 
 AC_PATH_PROG(INTLTOOL_EXTRACT, intltool-extract, "none", $SPATH)
-if test $INTLTOOL_EXTRACT = "none"
+if test "$INTLTOOL_EXTRACT" = "none"
 then
     AC_MSG_ERROR([intltool-extract not found])
 fi
@@ -1075,12 +1087,22 @@ AC_ARG_ENABLE(build-documentation,
 # --enable-build-documentation=html).  =html itself warn-and-disables
 # only the missing PDF tools; users who want PDF best-effort can pass
 # =html and rebuild after installing the missing tools.
+AC_ARG_ENABLE(manpages,
+    AS_HELP_STRING([--disable-manpages], [Disable building man pages]),
+    [BUILD_MANPAGES=$enableval],
+    [BUILD_MANPAGES=yes])
+AC_SUBST([BUILD_MANPAGES])
+
 # halcompile manpages need asciidoctor regardless of BUILD_DOCS.
 AC_PATH_PROG(ASCIIDOCTOR,asciidoctor,"none")
 if ( test "none" = "$ASCIIDOCTOR" ) ; then
-    AC_MSG_ERROR([no asciidoctor, manpages cannot be built
+    if ( test "x$BUILD_MANPAGES" = "xyes" ) ; then
+        AC_MSG_ERROR([no asciidoctor, manpages cannot be built
 install with "sudo apt-get install asciidoctor" on Debian / Ubuntu,
 "sudo dnf install rubygem-asciidoctor" on Fedora, or "gem install asciidoctor"])
+    else
+        AC_MSG_NOTICE([asciidoctor not found, bypassing manpage build...])
+    fi
 fi
 
 if ( test "$BUILD_DOCS" = "yes" ) ; then
@@ -1362,6 +1384,8 @@ AH_BOTTOM(#endif
 # so testing is done by finding tclConfig.sh and tkConfig.sh                 #
 # if the search fails the traditional check is done                          #
 ##############################################################################
+if test "$BUILD_GUI" = "yes"; then
+
 AC_MSG_CHECKING([for tcl])
 
 AC_ARG_WITH(tclConfig,
@@ -1518,6 +1542,11 @@ install with "sudo apt-get install python3-gi"])
     fi
 fi
 
+else
+    TCLSH=tclsh
+    WISH=wish
+fi
+
 AC_SUBST([TCL_DBGX])
 AC_SUBST([TK_DBGX])
 AC_SUBST([TCL_CFLAGS])
@@ -1553,7 +1582,9 @@ AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
 	    [HAVE_XINERAMA=no])
 
 if test "x$HAVE_XINERAMA" = "xno"; then
-    AC_MSG_ERROR([Xinerama library or headers not found])
+    if test "$BUILD_GUI" = "yes"; then
+        AC_MSG_ERROR([Xinerama library or headers not found])
+    fi
 fi
 
 #clean out LIBS
@@ -1657,6 +1688,7 @@ then
 fi
 AC_MSG_RESULT(OK)
 
+if test "$BUILD_GUI" = "yes"; then
 AC_MSG_CHECKING([match between tk and Tkinter versions])
 if $PYTHON -c 'import sys;raise SystemExit(sys.hexversion<0x3040000)'
 then
@@ -1681,11 +1713,13 @@ if test "$PYTHON_TK_VERSION" != "$TK_VERSION"; then
     AC_MSG_ERROR(["Python requires use of Tk $TK_VERSION.  Install this version and specify --with-tkConfig if necessary"])
 fi
 AC_MSG_RESULT([$PYTHON_TK_VERSION])
+fi
 
 AC_MSG_CHECKING(for site-package location)
 SITEPY=`$PYTHON -c "import sysconfig; s=sysconfig.get_scheme_names(); print(sysconfig.get_path('platlib', 'deb_system' if 'deb_system' in s else 'rpm_prefix' if 'rpm_prefix' in s else sysconfig.get_default_scheme()))"`
 AC_MSG_RESULT($SITEPY)
 
+if test "$BUILD_GUI" = "yes"; then
 AC_MSG_CHECKING(for working GLU quadrics)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <GL/gl.h>
@@ -1697,6 +1731,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 
 AC_MSG_CHECKING(for Xmu headers)
 AC_CHECK_HEADERS(X11/Xmu/Xmu.h,[],[AC_MSG_ERROR([Required Xmu header missing.  Install it, or specify --disable-python to skip the parts of LinuxCNC that depend on Python])])
+fi
 
 AC_SUBST([LIBPYTHON])
 AC_SUBST([SITEPY])

src/emc/usr_intf/Submakefile

@@ -23,7 +23,9 @@ $(call TOOBJSDEPS, $(EMCSHSRCS)) : EXTRAFLAGS = $(ULFLAGS) $(TCL_CFLAGS) -fPIC
 ../tcl/linuxcnc.so: $(call TOOBJS, $(EMCSHSRCS)) ../lib/liblinuxcnc.a ../lib/liblinuxcncini.so.1 ../lib/libnml.so.0
 	$(ECHO) Linking $(notdir $@)
 	$(Q)$(CXX) -shared $(LDFLAGS) -o $@ $(ULFLAGS) $(TCL_CFLAGS) $^ $(TCL_LIBS) -lXinerama
+ifeq ($(BUILD_GUI),yes)
 TARGETS += ../tcl/linuxcnc.so
+endif
 
 ../bin/linuxcncrsh: $(call TOOBJS, $(EMCRSHSRCS)) ../lib/liblinuxcnchal.so.0 ../lib/liblinuxcnc.a ../lib/libnml.so.0 ../lib/liblinuxcncini.so.1
 	$(ECHO) Linking $(notdir $@)

src/emc/usr_intf/axis/Submakefile

@@ -27,10 +27,18 @@ $(TKDARMODULE): $(call TOOBJS, $(TKDARMODULESRCS))
 	$(ECHO) Linking python module $(notdir $@)
 	$(Q)$(CC) $(LDFLAGS) -shared -o $@ $(TCL_CFLAGS) $^ -lX11 $(TCL_LIBS)
 
-PYTARGETS += $(EMCMODULE) $(TOGLMODULE) $(TKDARMODULE)
+PYTARGETS += $(EMCMODULE)
+ifeq ($(BUILD_GUI),yes)
+PYTARGETS += $(TOGLMODULE) $(TKDARMODULE)
+endif
 
-PYSCRIPTS := axis.py axis-remote.py linuxcnctop.py hal_manualtoolchange.py \
+ALL_PYSCRIPTS := axis.py axis-remote.py linuxcnctop.py hal_manualtoolchange.py \
 	mdi.py image-to-gcode.py lintini.py debuglevel.py teach-in.py tracking-test.py
+
+PYSCRIPTS := linuxcnctop.py mdi.py lintini.py debuglevel.py tracking-test.py
+ifeq ($(BUILD_GUI),yes)
+PYSCRIPTS += axis.py axis-remote.py hal_manualtoolchange.py image-to-gcode.py teach-in.py
+endif
 PYBIN := $(patsubst %.py,../bin/%,$(PYSCRIPTS))
 PYTARGETS += $(PYBIN)
 
@@ -41,6 +49,6 @@ $(PYBIN): ../bin/%: emc/usr_intf/axis/scripts/%.py
 	$(ECHO) Copying python script $(notdir $@)
 	$(Q)(echo '#!$(PYTHON)'; sed '1 { /^#!/d; }' $<) > $@.tmp && chmod +x $@.tmp && mv -f $@.tmp $@
 
-PYI18NSRCS += $(addprefix emc/usr_intf/axis/scripts/, $(PYSCRIPTS))  \
+PYI18NSRCS += $(addprefix emc/usr_intf/axis/scripts/, $(ALL_PYSCRIPTS))  \
 	../lib/python/propertywindow.py \
 	../share/axis/tcl/axis.tcl

src/hal/components/Submakefile

@@ -42,7 +42,9 @@ else
 COMP_DRIVERS := $(wildcard hal/drivers/*.comp)
 endif
 COMP_DRIVER_MANPAGES := $(patsubst hal/drivers/%.comp, ../docs/build/man/man9/%.9, $(COMP_DRIVERS))
+ifeq ($(BUILD_MANPAGES),yes)
 TARGETS += manpages
+endif
 GENERATED_MANPAGES += $(COMP_MANPAGES)
 GENERATED_MANPAGES += $(COMP_DRIVER_MANPAGES)
 .PHONY: manpages