From 08b4c62aed7596a4b13d046250af7f8c469a9b1c Mon Sep 17 00:00:00 2001
From: Achim Gratz <Stromeko@Stromeko.DE>
Date: Wed, 3 Oct 2012 18:39:07 +0200
Subject: [PATCH] introduce dummy org-install.el to catch old installations

* lisp/Makefile: Arrange for an uncompiled org-install.el.  This also
  ensures that if there's an old org-install.el in the installation
  directory, it will be replaced and not linger.

* lisp/org-install.el: Provide an empty file that prints a warning
  about an outdated configuration.
---
 lisp/Makefile       |  8 ++++----
 lisp/org-install.el | 13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 lisp/org-install.el

diff --git a/lisp/Makefile b/lisp/Makefile
index ef8c625..e2f1768 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -7,8 +7,9 @@ endif
 LISPV = org-version.el
 LISPI = org-loaddefs.el
 LISPA = $(LISPV) $(LISPI)
+LISPB = $(LISPA:%el=%elc) org-install.elc
 LISPF = $(filter-out $(LISPA),$(sort $(wildcard *.el)))
-LISPC = $(filter-out $(LISPN:%el=%elc),$(LISPF:%el=%elc))
+LISPC = $(filter-out $(LISPB) $(LISPN:%el=%elc),$(LISPF:%el=%elc))
 _ORGCM_ = dirall single source slint1 slint2
 -include local.mk
 
@@ -65,7 +66,7 @@ $(LISPV):	$(LISPF)
 	@$(MAKE_ORG_VERSION)
 
 $(LISPI):	$(LISPV) $(LISPF)
-	@echo "org-install: $(ORGVERSION) ($(GITVERSION))"
+	@echo "org-loaddefs: $(ORGVERSION) ($(GITVERSION))"
 	@$(RM) $(@)
 	@$(MAKE_ORG_INSTALL)
 
@@ -76,10 +77,9 @@ install:	$(LISPF) compile
 	$(CP) $(LISPC) $(LISPF) $(LISPA) $(DESTDIR)$(lispdir)
 
 cleanauto clean cleanall::
-	$(RM) $(LISPA) $(LISPA:%el=%elc)
+	$(RM) $(LISPA) $(LISPB)
 clean cleanall cleanelc::
 	$(RM) *.elc
-	$(RM) org-install.el # Fix leftover from previous install method
 
 clean-install:
 	if [ -d $(DESTDIR)$(lispdir) ] ; then \
diff --git a/lisp/org-install.el b/lisp/org-install.el
new file mode 100644
index 0000000..a31d8b7
--- /dev/null
+++ b/lisp/org-install.el
@@ -0,0 +1,13 @@
+;;; org-install.el --- autogenerated file, do not edit
+;;
+;;; Code:
+(warn "The file org-install is obsolete.
+Please change your configuration to (require 'org) instead.")
+
+(provide 'org-install)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; coding: utf-8
+;; End:
+;;; org-install.el ends here
-- 
1.7.12.1