Browse Source

Merge branch 'maint'

Achim Gratz 5 years ago
parent
commit
b0938f684e
2 changed files with 17 additions and 4 deletions
  1. 4 4
      lisp/Makefile
  2. 13 0
      lisp/org-install.el

+ 4 - 4
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 \

+ 13 - 0
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