1. Shlomi Fish
  2. shlomi-fish-homepage

Commits

shl...@cec68495-dca5-4e2b-845c-11fdaaa4f967  committed 9671d8a

Integrated the fortunes into the build-system - but see the TODO.

  • Participants
  • Parent commits 2ca91ec
  • Branches default

Comments (0)

Files changed (4)

File Makefile

View file
 
 ALL_DEST_BASE = dest
 
-FORTUNES_TARGET = dest/t2-homepage/humour/fortunes/fortunes-index.html
+FORTUNES_TARGET = dest/t2-homepage/humour/fortunes/index.html
 
 DOCS_COMMON_DEPS = template.wml lib/MyNavData.pm
 
 t2/philosophy/Index/index.html.wml : lib/article-index/article-index.dtd lib/article-index/article-index.xml lib/article-index/article-index.xsl $(PHILOSOPHY_DEPS)
 	touch $@
 
-$(FORTUNES_TARGET): t2/humour/fortunes/fortunes-index.html.wml $(DOCS_COMMON_DEPS) $(HUMOUR_DEPS)
-	( cd t2 && wml $(WML_FLAGS) -DLATEMP_SERVER=t2 -DLATEMP_FILENAME=humour/fortunes/index.html humour/fortunes/fortunes-index.html.wml ) > $@
+$(FORTUNES_TARGET): t2/humour/fortunes/fortunes-index.html.wml $(DOCS_COMMON_DEPS) $(HUMOUR_DEPS) t2/humour/fortunes/Makefile
+	( cd t2 && wml $(WML_FLAGS) -DLATEMP_SERVER=t2 -DLATEMP_FILENAME=humour/fortunes/index.html -DPACKAGE_BASE="$$( unset MAKELEVEL ; cd humour/fortunes && make print_package_base )" humour/fortunes/fortunes-index.html.wml ) > $@
 
 T2_DOCS_SRC = $(patsubst $(T2_DEST)/%,$(T2_SRC_DIR)/%.wml,$(T2_DOCS_DEST))
 VIPE_DOCS_SRC = $(patsubst $(VIPE_DEST)/%,$(VIPE_SRC_DIR)/%.wml,$(VIPE_DOCS_DEST))
 
 %.show:
 	@echo "$* = $($*)"
+

File TODO

View file
 * Humour:
     - Add the "I like Job Control".
 
+* Fortunes:
+    - Make sure the *.tar.gz are installed by the makefile without help
+    from gen-helpers.pl.
+

File t2/humour/fortunes/Makefile

View file
 upload: dist
 	rsync -r -v --progress $(DATS) $(FILES) $(PACKAGE_BASE) $(INDEX_FILE) "$${HOMEPAGE_SSH_PATH}/Vipe/humour/fortunes/" 
 
+print_package_base:
+	@echo $(PACKAGE_BASE)
+

File t2/humour/fortunes/fortunes-index.html.wml

View file
 </p>
 
 <p>
-<!-- %%PACKAGE_BASE%% --><a href="fortunes-shlomif-0.2.7.tar.gz"><b>These fortunes in a tar.gz file</b></a>
+<a href="$(PACKAGE_BASE)"><b>These fortunes in a tar.gz file</b></a>
 </p>
 
 <p>