The branch, master has been updated via e7609978bb4f917a7f302c47703e3b36d017a771 (commit) via 170f387f8de5e8d3624be26907826cf1b0a044d4 (commit) from 68aa1cfc65cc702c54d1e5e314b2124a2442d862 (commit)

- Log ----------------------------------------------------------------- commit e7609978bb4f917a7f302c47703e3b36d017a771 Author: Michal Čihař mcihar@novell.com Date: Wed Mar 10 15:16:50 2010 +0100

This target is not used.

commit 170f387f8de5e8d3624be26907826cf1b0a044d4 Author: Michal Čihař mcihar@novell.com Date: Wed Mar 10 15:16:36 2010 +0100

Add rules to copy static content.

-----------------------------------------------------------------------

Summary of changes: Makefile | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile index ec23919..12d26b5 100755 --- a/Makefile +++ b/Makefile @@ -14,6 +14,10 @@ all: $(addsuffix /Documentation.html.stamp, $(addprefix output/, ${LANGUAGES})) $(addsuffix /README.stamp, $(addprefix output/, ${LANGUAGES})) \ $(addsuffix /INSTALL.stamp, $(addprefix output/, ${LANGUAGES})) \ $(addsuffix /TODO.stamp, $(addprefix output/, ${LANGUAGES})) \ + $(addsuffix /themes/original/img/docs_menu_bg.png, $(addprefix output/, ${LANGUAGES})) \ + $(addsuffix /themes/original/img/logo_right.png, $(addprefix output/, ${LANGUAGES})) \ + $(addsuffix /favicon.ico, $(addprefix output/, ${LANGUAGES})) \ + $(addsuffix /docs.css, $(addprefix output/, ${LANGUAGES})) \ output/index.html

@@ -54,6 +58,18 @@ output/%/index-template.html: generate-lang-index get-lang-name \ $(addsuffix /TODO, output/%)) ./generate-lang-index $* > $@

+output/%/docs.css: ../phpmyadmin/docs.css + cp $< $@ + +output/%/favicon.ico: ../phpmyadmin/favicon.ico + cp $< $@ + +output/%/themes/original/img/docs_menu_bg.png: ../phpmyadmin/themes/original/img/docs_menu_bg.png + cp $< $@ + +output/%/themes/original/img/logo_right.png: ../phpmyadmin/themes/original/img/logo_right.png + cp $< $@ + .PRECIOUS: output/%/index-full-template.html output/%/index-full-template.html: generate-lang-index get-lang-name ./generate-lang-index $* full > $@ @@ -88,23 +104,3 @@ po/%.po: pot/%-full.pot # This should be used once phpMyAdmin itself switches to gettext #msgmerge -U $@ -C ../phpmyadmin/po/$*.po $< touch $@ - -aadasdas: ../phpmyadmin/INSTALL ../phpmyadmin/TODO ../phpmyadmin/README ../phpmyadmin/Documentation.html ../phpmyadmin/translators.html output/%/index-full-template.html addendum/comment.html addendum/head.html - po4a-updatepo \ - --msgid-bugs-address phpmyadmin-devel@lists.sourceforge.net \ - --copyright-holder "the phpMyAdmin project" \ - --package-name "phpMyAdmin documentation" \ - -M utf-8 \ - -f xhtml \ - -m ../phpmyadmin/Documentation.html \ - -m../phpmyadmin/translators.html \ - -m output/$*/index-full-template.html \ - -m addendum/head.html \ - -f text \ - -m addendum/comment.html \ - -m ../phpmyadmin/INSTALL \ - -m ../phpmyadmin/TODO \ - -m../phpmyadmin/README \ - -p $@ - -# -f text \

hooks/post-receive