update org mode, do it in emacs

[buildscripts] / org-mode

diff --git a/org-mode b/org-mode
index 0474aa957a8ce1751dcaac6f22e42f4af7c75d95..701a5d16ace0e9ac024c51a3212f07316e1593a8 100755 (executable)
--- a/org-mode
+++ b/org-mode
@@ -28,8 +28,8 @@ if isdeb; then
 else
     logq pi texinfo-tex
 fi
-rm -rf !(.git)
-i checkout -f errbuff
+# rm -rf !(.git)
+# i checkout -f errbuff
 
 if [[ $1 == -u ]]; then
     git fetch
@@ -40,8 +40,14 @@ fi
 # org-learn is a dependency of org-drill
 dd of=local.mk <<'EOF'
 ORG_ADD_CONTRIB = org-drill org-learn
-EMACS = /usr/bin/emacs
+EMACS = /usr/local/bin/emacs
 prefix        = /a/c/.emacs.d
 EOF
-rm -rf /a/c/.emacs.d/emacs
+
+d=/a/c/.emacs.d/emacs
+if [[ -e $d ]]; then
+    d2=${d}-disabled
+    rm -rf $d2
+    mv $d $d2
+fi
 logq make install