emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/bnf-mode 99d3931 16/22: Updated make package targed to


From: Stefan Monnier
Subject: [elpa] externals/bnf-mode 99d3931 16/22: Updated make package targed to provide info files
Date: Tue, 3 Mar 2020 10:56:55 -0500 (EST)

branch: externals/bnf-mode
commit 99d393158b2c5ddcdcca13ab42858ec6bfc62495
Author: Serghei Iakovlev <address@hidden>
Commit: Serghei Iakovlev <address@hidden>

    Updated make package targed to provide info files
---
 Makefile      | 10 ++++------
 docs/Makefile |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 49e1317..fe635e7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,10 +28,6 @@ define org-clean
        @cat $^ | sed -e "s/\[\[.*\.svg\]\]//g"
 endef
 
-# TODO: Move to docs
-$(PACKAGE).info: README.org
-       $(call org-clean,$^) | $(PANDOC) $(PANDOCLAGS) -t texinfo | $(MAKEINFO) 
-o $@
-
 README: README.org
        $(call org-clean,$^) | $(PANDOC) $(PANDOCLAGS) -t plain | sed -e 
"s/\[\]//g" > $@
 
@@ -41,8 +37,10 @@ ChangeLog: NEWS
 $(PACKAGE)-pkg.el: $(PACKAGE).el
        @$(CASK) pkg-file
 
-$(ARCHIVE_NAME).tar: README ChangeLog LICENSE $(PACKAGE).el $(PACKAGE)-pkg.el 
$(PACKAGE).info dir
+$(ARCHIVE_NAME).tar: README ChangeLog LICENSE $(PACKAGE).el $(PACKAGE)-pkg.el
+       @$(MAKE) info
        @$(TAR) -c -v -f $(ARCHIVE_NAME).tar --transform 
"s@^@$(ARCHIVE_NAME)/@" $^
+       @cd docs && $(TAR) -r -f ../$(ARCHIVE_NAME).tar --transform 
"s@^@$(ARCHIVE_NAME)/@" $(PACKAGE).info dir
 
 ## Public targets
 
@@ -73,7 +71,7 @@ clean: clean-docs
        @$(RM) README ChangeLog $(PACKAGE).info coverage-final.json
        @$(RM) $(PACKAGE)-pkg.el $(PACKAGE)-*.tar
 
-.PHONY:
+.PHONY: clean-docs
 clean-docs:
        @$(MAKE) -C docs clean
 
diff --git a/docs/Makefile b/docs/Makefile
index 8f6630b..12c7afc 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -31,7 +31,7 @@ dir: $(INFOPAGES)
        $(info Generating dir)
        @echo $^ | xargs -n 1 $(INSTALL_INFO) --dir=$@
 
-.PHONY:
+.PHONY: clean
 clean:
        $(info Cleaning documentation...)
        @$(RM) dir $(INFOPAGES)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]