Merge pull request #131 from bkmgit/sblg

Ensure man pages get published

Author: jubalh

Makefile

@@ -1,49 +1,56 @@
 SBLG = sblg
-PREFIX = $(HOME)/profanity
-BLOG_POST_SRC_DIR = blogsource/content/post
-BLOG_POST_OUT_DIR = blog
+PREFIX = $(PWD)/site
+BLOG_SRC_TOP_DIR = blogsource/content
+BLOG_POST_SRC_DIR = $(BLOG_SRC_TOP_DIR)/post
+BLOG_POST_OUT_TOP_DIR = blog
+BLOG_POST_OUT_DIR = $(BLOG_POST_OUT_TOP_DIR)/post
 BLOG_POSTS = $(wildcard $(BLOG_POST_SRC_DIR)/*.md)
 BLOG_POSTS_OUT = $(subst $(BLOG_POST_SRC_DIR), $(BLOG_POST_OUT_DIR),  $(BLOG_POSTS:.md=.html))
 CONTRIBUTORS_SRC_DIR = blogsource/content/contributors
 CONTRIBUTORS_OUT_DIR = contributors
 CONTRIBUTORS = $(wildcard $(CONTRIBUTORS_SRC_DIR)/*.md)
 PAGES_SRC_DIR = pagesource
-PAGES = $(wildcard $(PAGE_SRC_DIR)/*.xml)
-PAGES_OUT = $(subst $(PAGES_SRC_DIR),, $(PAGES:.xml=.html))
+PAGES_SRC = $(wildcard $(PAGES_SRC_DIR)/*.xml)
+PAGES = $(subst $(PAGES_SRC_DIR)/,,$(PAGES_SRC:.xml=.html))
 REDIRECTS_DIR = pageredirects
 REDIRECTS_SRC = $(wildcard $(REDIRECTS_DIR)/*.html)
 REDIRECTS = $(subst $(REDIRECTS_DIR)/,,$(REDIRECTS_SRC))
 
-all: index.html $(PAGES_OUT) themegallery.html $(BLOG_POSTS_OUT) $(BLOG_POST_OUT_DIR)/atom.xml \
+all: index.html $(PAGES) themegallery.html $(BLOG_POSTS_OUT) $(BLOG_POST_OUT_DIR)/atom.xml \
      $(BLOG_POST_OUT_DIR)/index.html $(CONTRIBUTORS_OUT) $(CONTRIBUTORS_OUT_DIR)/index.html $(REDIRECTS)
 
-install:  index.html $(PAGES_OUT) themegallery.html $(BLOG_POSTS_OUT) $(BLOG_POST_OUT_DIR)/atom.xml \
+install:  index.html $(PAGES) themegallery.html $(BLOG_POSTS_OUT) $(BLOG_POST_OUT_DIR)/atom.xml \
 	$(BLOG_POST_OUT_DIR)/index.html $(CONTRIBUTORS_OUT) $(CONTRIBUTORS_OUT_DIR)/index.html $(REDIRECTS)
 	mkdir -p $(PREFIX)
 	install -m0444 *.html $(PREFIX)
-	install -m0444 -p -D -t $(PREFIX)/blog blog/*.html
-	install -m0444 -p -D -t $(PREFIX)/blog/img blog/img/*.png
-	install -m0444 -p -D -t $(PREFIX)/contributors contributors/*.html
-	install -m0444 -p -D -t $(PREFIX)/contributors/img contributors/img/*jpg
+	install -m0444 -p -D -t $(PREFIX)/$(BLOG_POST_OUT_TOP_DIR) $(BLOG_POST_OUT_TOP_DIR)/index.html
+	install -m0444 -p -D -t $(PREFIX)/$(BLOG_POST_OUT_DIR) $(BLOG_POST_OUT_DIR)/*.html
+	install -m0444 -p -D -t $(PREFIX)/$(BLOG_POST_OUT_DIR)/img $(BLOG_POST_OUT_DIR)/img/*.png
+	install -m0444 -p -D -t $(PREFIX)/$(CONTRIBUTORS_OUT_DIR) $(CONTRIBUTORS_OUT_DIR)/*.html
+	install -m0444 -p -D -t $(PREFIX)/$(CONTRIBUTORS_OUT_DIR)/img $(CONTRIBUTORS_OUT_DIR)/img/*jpg
 	cp -p -r css $(PREFIX)
 	cp -p -r guide $(PREFIX)
 	cp -p -r images $(PREFIX)
 	cp -p -r js $(PREFIX)
 	cp -p -r plugins $(PREFIX)
 	cp -p -r tarballs $(PREFIX)
 
+
 index.html: landing-template.xml
 	$(SBLG) -o $@ -t landing-template.xml -c index.xml
 
-$(PAGES_OUT): manual-template.xml
-	$(SBLG) -o $@ -t manual-template.xml -c $(addprefix $PAGES_SRC_DIR)/,($(subst .html,.xml,$@))
+$(PAGES): manual-template.xml
+	cp --preserve=mode,ownership,timestamps $(addprefix $(PAGES_SRC_DIR)/,$(@:.html=.xml)) .
+	$(SBLG) -o $@ -t manual-template.xml -c $(@:.html=.xml)
+	rm -f $(PAGES:.html=.xml)
 
 themegallery.html: gallery-template.xml
 	$(SBLG) -o $@ -t gallery-template.xml -c themegallery.xml
 
 $(BLOG_POST_OUT_DIR)/atom.xml $(BLOG_POST_OUT_DIR)/index.html $(BLOG_POSTS_OUT): $(BLOG_POSTS)
 	$(MAKE) -C $(BLOG_POST_SRC_DIR)
-	mkdir $(BLOG_POST_OUT_DIR)
+	mkdir -p $(BLOG_POST_OUT_DIR)
+	cp --preserve=mode,ownership,timestamps $(BLOG_SRC_TOP_DIR)/index.html $(BLOG_POST_OUT_TOP_DIR)/
 	mv $(BLOG_POST_SRC_DIR)/*.html $(BLOG_POST_OUT_DIR)/
 	mv $(BLOG_POST_SRC_DIR)/atom.xml $(BLOG_POST_OUT_DIR)/
 	cp --preserve=mode,ownership,timestamps --recursive $(BLOG_POST_SRC_DIR)/img $(BLOG_POST_OUT_DIR)/
@@ -62,6 +69,6 @@ $(REDIRECTS): $(REDIRECTS_SRC)
 clean:
 	$(MAKE) -C $(BLOG_POST_SRC_DIR) clean
 	$(MAKE) -C $(CONTRIBUTORS_SRC_DIR) clean
-	rm -f index.html $(PAGES_OUT) themegallery.html $(REDIRECTS)
-	rm -r $(BLOG_POSTS_XML) $(BLOG_POSTS_OUT) $(BLOG_POST_OUT_DIR)
+	rm -f index.html $(PAGES) themegallery.html $(REDIRECTS)
+	rm -r $(BLOG_POSTS_XML) $(BLOG_POSTS_OUT) $(BLOG_POST_OUT_TOP_DIR)
 	rm -r $(CONTRIBUTORS_XML) $(CONTRIBUTORS_OUT) $(CONTRIBUTORS_OUT_DIR)

blogsource/content/index.html

@@ -0,0 +1,7 @@
+<html>
+<head>
+</head>
+</body>
+<script>window.location = "http://profanity-im.github.io/blog/content/post/index.html";</script>
+</body>
+</html>

blogsource/content/post/Makefile

@@ -18,7 +18,7 @@ $(BLOG_POSTS_XML): $(BLOG_POSTS)
 	echo "<article id=\"manual\" data-sblg-article=\"1\">"  >$@
 	echo " <header>" >>$@
 	echo "  <h3>`lowdown -X title $(subst .xml,.md,$@)`</h3>" >>$@
-	echo "  <address><a href=\"../contributors/`lowdown -X authors $(subst .xml,.md,$@)`.html\">`lowdown -X authors $(subst .xml,.md,$@)`</a></address>" >>$@
+	echo "  <address><a href=\"../../contributors/`lowdown -X authors $(subst .xml,.md,$@)`.html\">`lowdown -X authors $(subst .xml,.md,$@)`</a></address>" >>$@
 	echo "  <time datetime=\"`lowdown -X date $(subst .xml,.md,$@) | cut -f1 -dT`\">`lowdown -X date $(subst .xml,.md,$@) | cut -f1 -dT`</time>" >>$@
 	echo " </header>" >>$@
 	lowdown  $(subst .xml,.md,$@) >>$@

blogsource/content/post/blog-post-template.xml

@@ -11,7 +11,7 @@
 </head>
 
 <body id="blogpost">
-    <img class="overlay" src="../images/profanity_mouth-only.png" alt="Profanity Illustration" />
+    <img class="overlay" src="../../images/profanity_mouth-only.png" alt="Profanity Illustration" />
     <header>
         <h1>
             <a href="index.html">