From 6d8430971dada74478a0cd2c9eca2272a105b744 Mon Sep 17 00:00:00 2001
From: Thomas Ulmer <thomasmulmer02@gmail.com>
Date: Sun, 1 Mar 2026 11:35:48 -0800
Subject: move emacs build out of tree

---
 .gitmodules                 |  2 +-
 emacs-source/emacs-source   |  1 +
 emacs-source/setup.sh       | 28 ++++++++++++++++++++++++++++
 tree/src/emacs/emacs-source |  1 -
 tree/src/emacs/setup.sh     | 28 ----------------------------
 5 files changed, 30 insertions(+), 30 deletions(-)
 create mode 160000 emacs-source/emacs-source
 create mode 100755 emacs-source/setup.sh
 delete mode 160000 tree/src/emacs/emacs-source
 delete mode 100755 tree/src/emacs/setup.sh

diff --git a/.gitmodules b/.gitmodules
index b3624c2..3681147 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -14,7 +14,7 @@
 	path = tree/src/unclutter/unclutter-xfixes
 	url = https://github.com/Airblader/unclutter-xfixes
 [submodule "tree/src/emacs/emacs-source"]
-	path = tree/src/emacs/emacs-source
+	path = emacs-source/emacs-source
 	url = git://git.savannah.gnu.org/emacs.git
 [submodule "tree/src/levee/levee"]
 	path = tree/src/levee/levee
diff --git a/emacs-source/emacs-source b/emacs-source/emacs-source
new file mode 160000
index 0000000..3ea1010
--- /dev/null
+++ b/emacs-source/emacs-source
@@ -0,0 +1 @@
+Subproject commit 3ea1010a6b0a63e90896133deaba189f13d47436
diff --git a/emacs-source/setup.sh b/emacs-source/setup.sh
new file mode 100755
index 0000000..e7ca491
--- /dev/null
+++ b/emacs-source/setup.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+set -e
+
+EMACSFULL="--with-x-toolkit=gtk3 --disable-build-details --with-cairo \
+           --with-harfbuzz --with-libsystemd=no --with-modules \
+           --with-tree-sitter"
+
+EMACSMIN="--without-all \
+          --with-x-toolkit=no  --without-xwidgets --without-x --without-ns --disable-ns-self-contained \
+          --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no \
+          --without-internationalization --without-tree-sitter --without-mailutils"
+
+EMACSALWAYS="--with-gnutls --with-file-notification=yes --with-native-compilation=yes --with-zlib=yes"
+
+
+if [[ "$(read -e -p 'Build minimal emacs? [y/N]> '; echo $REPLY)" == [Yy]* ]]; then
+    EMACSOPT="${EMACSMIN}  ${EMACSALWAYS}"
+else
+    EMACSOPT="${EMACSFULL} ${EMACSALWAYS}"
+fi
+cd emacs-source
+./autogen.sh
+./configure --prefix="${HOME}/.local" \
+            ${EMACSOPT} \
+            CFLAGS='-O2 -pipe'
+make
+make install
diff --git a/tree/src/emacs/emacs-source b/tree/src/emacs/emacs-source
deleted file mode 160000
index 3ea1010..0000000
--- a/tree/src/emacs/emacs-source
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3ea1010a6b0a63e90896133deaba189f13d47436
diff --git a/tree/src/emacs/setup.sh b/tree/src/emacs/setup.sh
deleted file mode 100755
index e7ca491..0000000
--- a/tree/src/emacs/setup.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -e
-
-EMACSFULL="--with-x-toolkit=gtk3 --disable-build-details --with-cairo \
-           --with-harfbuzz --with-libsystemd=no --with-modules \
-           --with-tree-sitter"
-
-EMACSMIN="--without-all \
-          --with-x-toolkit=no  --without-xwidgets --without-x --without-ns --disable-ns-self-contained \
-          --with-xpm=no --with-jpeg=no --with-png=no --with-gif=no --with-tiff=no \
-          --without-internationalization --without-tree-sitter --without-mailutils"
-
-EMACSALWAYS="--with-gnutls --with-file-notification=yes --with-native-compilation=yes --with-zlib=yes"
-
-
-if [[ "$(read -e -p 'Build minimal emacs? [y/N]> '; echo $REPLY)" == [Yy]* ]]; then
-    EMACSOPT="${EMACSMIN}  ${EMACSALWAYS}"
-else
-    EMACSOPT="${EMACSFULL} ${EMACSALWAYS}"
-fi
-cd emacs-source
-./autogen.sh
-./configure --prefix="${HOME}/.local" \
-            ${EMACSOPT} \
-            CFLAGS='-O2 -pipe'
-make
-make install
-- 
cgit v1.2.3