From bea8eedd0275fed5a776af756e552663a21f7dd3 Mon Sep 17 00:00:00 2001 From: leannep Date: Tue, 17 Mar 2026 19:09:06 +0100 Subject: [PATCH 1/3] Add subdirs sections, tables; check they are not empty; README.txt is README.rst --- Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1ef9647..ce60212 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,10 @@ DOCTYPE = RTN DOCNUMBER = 115 DOCNAME = $(DOCTYPE)-$(DOCNUMBER) FLATDIR = forAAS +SUBDIRS = figures tables sections tex = $(filter-out $(wildcard *aglossary.tex) , $(wildcard *.tex)) - GITVERSION := $(shell git log -1 --date=short --pretty=%h) GITDATE := $(shell git log -1 --date=short --pretty=%ad) GITSTATUS := $(shell git status --porcelain) @@ -28,9 +28,12 @@ flat: mkdir $(FLATDIR) ; \ fi latexpand --keep-comments -o $(FLATDIR)/$(DOCNAME).tex $(DOCNAME).tex - if [ -d "figures" ]; then \ - cp figures/* $(FLATDIR) ;\ - fi + @for dir in $(SUBDIRS); do \ + if [ -d "$$dir" ] && [ -n "$$(ls -A $$dir 2>/dev/null)" ]; then \ + cp $$dir/* $(FLATDIR); \ + echo " ✓ Copied $$dir"; \ + fi; \ + done cp aas*.* $(FLATDIR) cp *.bib $(FLATDIR) cd $(FLATDIR) &&\ @@ -39,9 +42,8 @@ flat: latexmk -bibtex -xelatex -f $(DOCNAME) &&\ latexmk -c &&\ rm -f *.gls *.xdv *.glg *.glo *.ist *.bib &&\ - rm README.txt - echo "Flat files in $(FLATDIR)." - + if [ -f README.rst ]; then rm README.txt; fi && \ + echo "Flat files in $(FLATDIR)." .PHONY: clean clean: From bc3ad040c58fb91a50ea19746096137d5b573ca6 Mon Sep 17 00:00:00 2001 From: leannep Date: Wed, 18 Mar 2026 13:34:42 +0100 Subject: [PATCH 2/3] Only copy figures, check directory is not empty and corect name of README file --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ce60212..f889f2e 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ DOCTYPE = RTN DOCNUMBER = 115 DOCNAME = $(DOCTYPE)-$(DOCNUMBER) FLATDIR = forAAS -SUBDIRS = figures tables sections +SUBDIRS = figures tex = $(filter-out $(wildcard *aglossary.tex) , $(wildcard *.tex)) @@ -56,8 +56,6 @@ clean: .FORCE: - - SCRIPTS_DIR=scripts PYTHON_SCRIPTS=$(wildcard $(SCRIPTS_DIR)/*.py) From 1c79923cf6f30e4468ba6ef89e78ed18ef11b472 Mon Sep 17 00:00:00 2001 From: William O'Mullane Date: Wed, 18 Mar 2026 11:37:44 -0300 Subject: [PATCH 3/3] fix readme delete --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f889f2e..a6ee694 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ flat: latexmk -bibtex -xelatex -f $(DOCNAME) &&\ latexmk -c &&\ rm -f *.gls *.xdv *.glg *.glo *.ist *.bib &&\ - if [ -f README.rst ]; then rm README.txt; fi && \ + if [ -f README.txt ]; then rm README.txt; fi && \ echo "Flat files in $(FLATDIR)." .PHONY: clean