[phpwiki-checkins] CVS: phpwiki/locale Makefile,1.2,1.3

[Geoffrey T. D. <da...@us...>]

Update of /cvsroot/phpwiki/phpwiki/locale
In directory usw-pr-cvs1:/tmp/cvs-serv18546/locale

Modified Files:
	Makefile 
Log Message:
Fix so that xgettext scans templates, too, for strings to translate.
Also add -k_ flag to xgettext so that it recognizes _("") as an
alias for gettext("").


Index: Makefile
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/locale/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile	2001/05/21 17:28:44	1.2
--- Makefile	2001/11/29 03:04:36	1.3
***************
*** 13,17 ****
  PHP_FILES = ${MO_FILES:.mo=.php}
  
! PHP_SRC := $(wildcard ../lib/*.php ../admin/*.php)
  
  .PHONY: all po mo
--- 13,17 ----
  PHP_FILES = ${MO_FILES:.mo=.php}
  
! PHP_SRC := $(wildcard ../lib/*.php ../admin/*.php ../templates/*.html)
  
  .PHONY: all po mo
***************
*** 22,31 ****
  
  po/phpwiki.pot : ${PHP_SRC}
! 	xgettext -L C++ -o $@ $^
  
  po/%.po : po/phpwiki.pot
  	test -f $@ || touch $@
! 	mv -f $@ $@~
! 	msgmerge -o $@ $@~ $^
  
  %/LC_MESSAGES/phpwiki.mo : po/%.po
--- 22,31 ----
  
  po/phpwiki.pot : ${PHP_SRC}
! 	xgettext -L C++ -k_ -o $@ $^
  
  po/%.po : po/phpwiki.pot
  	test -f $@ || touch $@
! 	cp -f $@ $@~
! 	msgmerge -o $@.new $@~ $^ && mv -f $@.new $@
  
  %/LC_MESSAGES/phpwiki.mo : po/%.po