Commits

Shlomi Fish committed 23a47f3

Made sure updating the fortunes won't be time consuming.

Comments (0)

Files changed (3)

 lib/fiction-xml/xml/The-Pope-Died-on-Sunday-hebrew.xml
 lib/fiction-xml/xml/fiction-text-example-for-X-G-Fiction-demo.xml
 lib/fiction-xml/xml/human-hacking-field-guide-v2--hebrew.xml
+lib/fortunes/all-in-one.uncompressed.html.wml
 lib/fortunes/xhtmls/*.xhtml
 lib/fortunes/xhtmls/*.xhtml-for-input
 lib/htmls/The-Enemy-English-rev5.html-part
 rng
 rules.mak
 t2/humour/fortunes/*.dat
-t2/humour/fortunes/all-in-one.uncompressed.html.wml
 t2/humour/fortunes/arcs-list.mak
 t2/humour/fortunes/fortunes-shlomif-*.tar.gz
 t2/humour/fortunes/fortunes-shlomif-all.atom
 T2_FORTUNES_DIR = t2/$(FORTUNES_DIR)
 FORTUNES_ALL_IN_ONE__BASE = all-in-one.html
 FORTUNES_ALL_IN_ONE__TEMP__BASE = all-in-one.uncompressed.html
-T2_FORTUNES_ALL_WML = $(T2_FORTUNES_DIR)/$(FORTUNES_ALL_IN_ONE__TEMP__BASE).wml
+T2_FORTUNES_ALL_WML = lib/fortunes/$(FORTUNES_ALL_IN_ONE__TEMP__BASE).wml
 T2_FORTUNES_ALL__HTML = $(T2_DEST_FORTUNES_DIR)/$(FORTUNES_ALL_IN_ONE__BASE)
 T2_FORTUNES_ALL__TEMP__HTML = $(T2_DEST_FORTUNES_DIR)/$(FORTUNES_ALL_IN_ONE__TEMP__BASE)
 
 $(FORTUNES_TARGET): $(T2_FORTUNES_DIR)/index.html.wml $(DOCS_COMMON_DEPS) $(HUMOUR_DEPS) $(T2_FORTUNES_DIR)/Makefile $(T2_FORTUNES_DIR)/ver.txt
 	WML_LATEMP_PATH="$$(perl -MFile::Spec -e 'print File::Spec->rel2abs(shift)' '$@')" ; ( cd $(T2_SRC_DIR) && wml -o "$${WML_LATEMP_PATH}" $(T2_WML_FLAGS) -DLATEMP_FILENAME=$(patsubst $(T2_DEST)/%,%,$(patsubst %.wml,%,$@)) -DPACKAGE_BASE="$$( unset MAKELEVEL ; cd $(FORTUNES_DIR) && make print_package_base )" $(patsubst $(T2_SRC_DIR)/%,%,$<) )
 
+$(T2_FORTUNES_ALL__TEMP__HTML): $(T2_FORTUNES_ALL_WML) $(DOCS_COMMON_DEPS) $(FORTUNES_XHTMLS__FOR_INPUT_PORTIONS)
+	WML_LATEMP_PATH="$$(perl -MFile::Spec -e 'print File::Spec->rel2abs(shift)' '$@')" ; WML_LATEMP_SRC_PATH="$$(perl -MFile::Spec -e 'print File::Spec->rel2abs(shift)' '$<')" ; ( cd $(T2_SRC_DIR) && wml -o "$${WML_LATEMP_PATH}" $(T2_WML_FLAGS) -DLATEMP_FILENAME=$(patsubst $(T2_DEST)/%,%,$(patsubst %.wml,%,$@)) -DPACKAGE_BASE="$$( unset MAKELEVEL ; cd $(FORTUNES_DIR) && make print_package_base )" "$${WML_LATEMP_SRC_PATH}" )
 
 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))
 
 if (system($^X,
         '-Ilib', 'bin/gen-forts-all-in-one-page.pl',
-        't2/humour/fortunes/all-in-one.uncompressed.html.wml',
+        'lib/fortunes/all-in-one.uncompressed.html.wml',
     )
 )
 {