# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1710346586 14400
# Node ID 47ac621e632f70bb05399bcf1a6ab7c9fb6f0e3c
# Parent  0abe4f772e3e2bcca4ce7184ebafe765a435e2fd
append our octaverc file to existing site rcfile

* binary-dist-rules.mk (copy-dist-files): Append octaverc to existing
file instead of overwriting.
* octaverc: Note that these commands come from MXE Octave.

diff -r 0abe4f772e3e -r 47ac621e632f binary-dist-rules.mk
--- a/binary-dist-rules.mk	Tue Mar 12 23:44:43 2024 -0400
+++ b/binary-dist-rules.mk	Wed Mar 13 12:16:26 2024 -0400
@@ -80,8 +80,13 @@
   echo "  octave and dependencies..."
   cd $(HOST_PREFIX) \
     && tar -c $(TAR_H_OPTION) -f - . | ( cd $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH) ; tar xpf - )
-  echo "  octaverc file..."
-  cp $(TOP_DIR)/octaverc $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/share/octave/site/m/startup/octaverc
+  if [ -f "$(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/share/octave/site/m/startup/octaverc" ]; then \
+    echo "  octaverc file (appending to existing file)..."; \
+    cat $(TOP_DIR)/octaverc >> $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/share/octave/site/m/startup/octaverc; \
+  else \
+    echo "  octaverc file..."; \
+    cp $(TOP_DIR)/octaverc $(OCTAVE_DIST_DIR)$(OCTAVE_ADD_PATH)/share/octave/site/m/startup/octaverc; \
+  fi
   if [ $(ENABLE_BINARY_PACKAGES) = no ]; then \
     echo "  build_packages.m..."; \
     cp $(TOP_DIR)/build_packages.m $(OCTAVE_DIST_DIR)/src; \
diff -r 0abe4f772e3e -r 47ac621e632f octaverc
--- a/octaverc	Tue Mar 12 23:44:43 2024 -0400
+++ b/octaverc	Wed Mar 13 12:16:26 2024 -0400
@@ -1,7 +1,11 @@
-## System-wide startup file for Octave.
+
+## Begin MXE Octave additions to system-wide startup file for Octave.
 ##
 ## This file should contain any commands that should be executed each
 ## time Octave starts for every user at this site.
+
 EXEC_PATH (cstrcat (fullfile (OCTAVE_HOME, 'notepad++'), pathsep, EXEC_PATH));
 EXEC_PATH (cstrcat (fullfile (OCTAVE_HOME, 'bin'), pathsep, EXEC_PATH));
 EDITOR (fullfile (OCTAVE_HOME, 'notepad++', 'notepad++.exe'));
+
+## End MXE Octave additions to system-wide startup file for Octave.