From d0a85f8b88ef3d5a817ad71bda489c23dab515c4 Mon Sep 17 00:00:00 2001
From: contrapunctus <contrapunctus@disroot.org>
Date: Sat, 15 Jan 2022 12:41:18 +0530
Subject: [PATCH] Don't warn about ORG_PATH

Org v9.3.8+ is now available on MELPA
---
 Makefile | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index d9a65e8..aca6744 100644
--- a/Makefile
+++ b/Makefile
@@ -6,26 +6,11 @@ setup:
 	emacs --batch --eval="(package-initialize)" \
 	--eval="(mapcar #'package-install '(indent-lint package-lint relint))"
 
-# No -q or -Q without ORG_PATH - if the user has a newer version of
-# Org, we want to use it.
+# No -q or -Q, in case the user has a newer version of Org.
 init-org.el:
-	if [ -z "${ORG_PATH}" ]; then \
-          echo ; \
-	  echo "[WARNING] ORG_PATH is unset. Org versions older than 9.3.8 have a bug" ; \
-	  echo "which result in them always using absolute paths in comment links in" ; \
-	  echo "tangled source files. If your Org version is older than 9.3.8, please" ; \
-	  echo "upgrade it before tangling." ; \
-          echo ; \
-          emacs --batch \
-	  --eval="(package-initialize)" \
-          --eval="(require 'ob-tangle)" \
-          --eval='(org-babel-tangle-file "init.org")' ; \
-        else \
-          emacs -q -Q --batch \
-          --eval="(add-to-list 'load-path \"${ORG_PATH}\")" \
-          --eval="(require 'ob-tangle)" \
-          --eval='(org-babel-tangle-file "init.org")' ; \
-        fi
+	emacs --batch \
+	--eval="(require 'ob-tangle)" \
+	--eval='(org-babel-tangle-file "init.org")'
 
 tangle: init-org.el