Skip to content

Commit 917cd71

Browse files
committed
separate --no-gui from OCTAVE var
1 parent 214207b commit 917cd71

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ install_stamp := $(installation_dir)/.install_stamp
6060
ifndef OCTAVE
6161
OCTAVE := octave
6262
endif
63-
OCTAVE := $(OCTAVE) --no-gui --silent --norc
63+
OCTAVE := $(OCTAVE) --silent --norc
6464
MKOCTFILE ?= mkoctfile
6565

6666
## Command used to set permissions before creating tarballs
@@ -179,7 +179,7 @@ html_options = --eval 'options = get_html_options ("octave-forge");' \
179179
--eval 'options.package_doc_options = [options.package_doc_options " --css-include=$(packageprefix)$(package).css"];'
180180
$(html_dir): $(install_stamp)
181181
$(RM) -r "$@";
182-
$(run_in_place) \
182+
$(run_in_place) --no-gui \
183183
--eval ' pkg load generate_html; ' \
184184
$(html_options) \
185185
--eval ' generate_package_html ("$(package)", "$@", options); ';
@@ -210,13 +210,13 @@ octave_install_commands = \
210210
## different versions of Octave.
211211
install: $(release_tarball)
212212
@echo "Installing package under $(installation_dir) ..."
213-
$(OCTAVE) --eval $(octave_install_commands)
213+
$(OCTAVE) --no-gui --eval $(octave_install_commands)
214214
touch $(install_stamp)
215215

216216
## Install only if installation (under target/...) is not current.
217217
$(install_stamp): $(release_tarball)
218218
@echo "Installing package under $(installation_dir) ..."
219-
$(OCTAVE) --eval $(octave_install_commands)
219+
$(OCTAVE) --no-gui --eval $(octave_install_commands)
220220
touch $(install_stamp)
221221

222222
clean-install:
@@ -234,15 +234,15 @@ clean-install:
234234
## Start an Octave session with the package directories on the path for
235235
## interactice test of development sources.
236236
run: $(install_stamp)
237-
$(run_in_place) --persist
237+
$(run_in_place) --no-gui --persist
238238

239239
rungui: $(install_stamp)
240240
$(run_in_place) --gui --persist
241241

242242
## Test example blocks in the documentation. Needs doctest package
243243
## https://octave.sourceforge.io/doctest/index.html
244244
doctest: $(install_stamp)
245-
$(run_in_place) --eval 'pkg load doctest;' \
245+
$(run_in_place) --no-gui --eval 'pkg load doctest;' \
246246
--eval "pkgs = pkg('list', '$(package)');" \
247247
--eval "target = {pkgs{1}.dir};" \
248248
--eval "doctest (target);"
@@ -259,7 +259,7 @@ octave_test_commands = \
259259
##
260260
## else cellfun (@runtests, horzcat (cellfun (@ (dir) ostrsplit (([~, dirs] = system (sprintf ("find %s -type d", dir))), "\n\r", true), dirs, "UniformOutput", false){:})); endif '
261261
check: $(install_stamp)
262-
$(run_in_place) --eval $(octave_test_commands)
262+
$(run_in_place) --no-gui --eval $(octave_test_commands)
263263

264264
##
265265
## Docs
@@ -336,7 +336,7 @@ endif
336336

337337

338338
runinplace: compile-inplace
339-
$(OCTAVE) --silent --persist --path "$(TOPDIR)/inst/" --path "$(TOPDIR)/src/" \
339+
$(OCTAVE) --no-gui --silent --persist --path "$(TOPDIR)/inst/" --path "$(TOPDIR)/src/" \
340340
--eval '$(PKG_ADD)'
341341

342342
clean-runinplace:

0 commit comments

Comments
 (0)