Commit 95ea1ee0 authored by Alexandre Duret-Lutz's avatar Alexandre Duret-Lutz
Browse files

org: fix recursive compilation

* doc/Makefile.am (org): Use $(MAKE), not make.
(org-deploy): Remove this obsolete rule.
parent 0c3e10d1
...@@ -51,10 +51,11 @@ dist_pkgdata_DATA = $(srcdir)/spot.tag ...@@ -51,10 +51,11 @@ dist_pkgdata_DATA = $(srcdir)/spot.tag
.PHONY: org .PHONY: org
org: org:
cd $(top_builddir) && make doc/org/init.el cd $(top_builddir) && $(MAKE) doc/org/init.el
rm -rf $(srcdir)/userdoc; mkdir -p tmp; cd tmp; \ rm -rf $(srcdir)/userdoc
$(EMACS) --batch -Q -l ../org/init.el mkdir -p tmp-$$$$ && cd tmp-$$$$ && \
rm -rf tmp $(EMACS) --batch -Q -l ../org/init.el && \
cd .. && rm -rf tmp-$$$$
ORG_FILES = \ ORG_FILES = \
org/.dir-locals.el.in \ org/.dir-locals.el.in \
...@@ -98,7 +99,7 @@ $(srcdir)/org/satmin.png: org/satmin.tex ...@@ -98,7 +99,7 @@ $(srcdir)/org/satmin.png: org/satmin.tex
rm -f satmin.pdf satmin.aux satmin.log rm -f satmin.pdf satmin.aux satmin.log
$(srcdir)/org-stamp: $(ORG_FILES) $(configure_ac) $(srcdir)/org-stamp: $(ORG_FILES) $(configure_ac)
make org && touch $@ $(MAKE) org && touch $@
$(srcdir)/userdoc: $(srcdir)/org-stamp $(srcdir)/userdoc: $(srcdir)/org-stamp
...@@ -110,8 +111,3 @@ EXTRA_DIST = \ ...@@ -110,8 +111,3 @@ EXTRA_DIST = \
$(ORG_FILES) \ $(ORG_FILES) \
$(srcdir)/org-stamp \ $(srcdir)/org-stamp \
$(srcdir)/userdoc $(srcdir)/userdoc
.PHONY: org-deploy
org-deploy: $(srcdir)/org-stamp
cd $(srcdir); \
rsync -P -z -u -v -r -l -C --delete userdoc/ spot:www_spot/userdoc
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment