summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchim Gratz <Stromeko@Stromeko.DE>2012-10-06 09:18:22 (GMT)
committer Achim Gratz <Stromeko@Stromeko.DE>2012-10-06 09:18:22 (GMT)
commitb0938f684ef2794b63fa1830e61320c0f4cc11cf (patch)
tree7240e0d6e3547fb22417438415de73024c0f197a
parent58b42debb18f8988cae7358642cbdc0287e3f2a5 (diff)
parent20ac3a3b360cc8382dc2a5d97955abf1bf0bab5a (diff)
downloadorg-mode-b0938f684ef2794b63fa1830e61320c0f4cc11cf.zip
org-mode-b0938f684ef2794b63fa1830e61320c0f4cc11cf.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/Makefile8
-rw-r--r--lisp/org-install.el13
2 files changed, 17 insertions, 4 deletions
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
--- a/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