null+****@clear*****
null+****@clear*****
2011年 5月 18日 (水) 14:17:37 JST
Kouhei Sutou 2011-05-18 05:17:37 +0000 (Wed, 18 May 2011)
New Revision: 2fc59030b97a9e9941573e937b45604d1f5b0109
Log:
[doc] move add-locale to doc/locale/ from doc/.
Added files:
doc/locale/tempalte.locale.LC_MESSAGES.Makefile.am
Copied files:
doc/locale/tempalte.locale.Makefile.am
(from doc/locale/ja/Makefile.am)
Removed files:
build/makefiles/locale.mk
Modified files:
doc/Makefile.am
doc/locale/Makefile.am
doc/locale/ja/Makefile.am
Deleted: build/makefiles/locale.mk (+0 -1) 100644
===================================================================
--- build/makefiles/locale.mk 2011-05-18 03:47:50 +0000 (30faab4)
+++ /dev/null
@@ -1 +0,0 @@
-LOCALES = en ja
Modified: doc/Makefile.am (+0 -14)
===================================================================
--- doc/Makefile.am 2011-05-18 03:47:50 +0000 (48bd918)
+++ doc/Makefile.am 2011-05-18 05:17:37 +0000 (523fac4)
@@ -8,20 +8,6 @@ include $(abs_top_srcdir)/build/makefiles/sphinx-build.mk
update-examples:
GROONGA=$(GROONGA) $(srcdir)/source/update_execution_example.py
-add-locale: gettext
- test -n "$(LOCALE)" || \
- (echo "run with LOCALE=\$${NEW_LOCALE}."; \
- echo "e.g.: make add-locale LOCALE=ja"; \
- false)
- mkdir -p $(srcdir)/locale/$(LOCALE)/LC_MESSAGE
- for pot in pot/*.pot; do \
- po=`basename $$pot | sed s/pot$$/po/`; \
- msginit \
- --input "$$pot" \
- --output $(srcdir)/locale/$(LOCALE)/LC_MESSAGE/$${po} \
- --locale=$(LOCALE); \
- done
-
# find pot -type f -name '*.pot' | sort | sed -e 's,^,\t,g'
pot_files = \
pot/characteristic.pot \
Modified: doc/locale/Makefile.am (+24 -3)
===================================================================
--- doc/locale/Makefile.am 2011-05-18 03:47:50 +0000 (3486a19)
+++ doc/locale/Makefile.am 2011-05-18 05:17:37 +0000 (1cb747d)
@@ -1,4 +1,25 @@
-include $(abs_top_srcdir)/build/makefiles/locale.mk
+SUBDIRS = \
+ ja
+
+add:
+ test -n "$(LOCALE)" || \
+ (echo "run with LOCALE=\$${NEW_LOCALE}."; \
+ echo "e.g.: make add LOCALE=ja"; \
+ false)
+ mkdir -p $(srcdir)/$(LOCALE)/LC_MESSAGE
+ sed -e 's,%LOCALE%,$(LOCALE),g' \
+ $(srcdir)/$(LOCALE)/template.locale.Makefile.am \
+ > $(srcdir)/$(LOCALE)/Makefile.am
+ sed -e 's,%LOCALE%,$(LOCALE),g' \
+ $(srcdir)/$(LOCALE)/template.locale.LC_MESSAGES.Makefile.am \
+ > $(srcdir)/$(LOCALE)/LC_MESSAGES/Makefile.am
+ sed -i'' \
+ -e 's,SUBDIRS =,SUBDIRS =\n\t$(LOCALE),' \
+ $(srcdir)/Makefile.am
+ sed -i'' \
+ -e "/doc\/locale\/ja\/Makefile/ \
+ a doc\/locale\/$(LOCALE)\/Makefile" \
+ -e "/doc\/locale\/ja\/LC_MESSAGES\/Makefile/ \
+ a doc\/locale\/$(LOCALE)\/LC_MESSAGES\Makefile" \
+ $(srcdir)/configure.ac
-# SUBDIRS = $(LOCALES)
-SUBDIRS = ja
Modified: doc/locale/ja/Makefile.am (+2 -0)
===================================================================
--- doc/locale/ja/Makefile.am 2011-05-18 03:47:50 +0000 (2575d12)
+++ doc/locale/ja/Makefile.am 2011-05-18 05:17:37 +0000 (6e44220)
@@ -1,3 +1,5 @@
SUBDIRS = LC_MESSAGES
+LOCALE = ja
+
include $(top_srcdir)/build/makefiles/sphinx.mk
Added: doc/locale/tempalte.locale.LC_MESSAGES.Makefile.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/tempalte.locale.LC_MESSAGES.Makefile.am 2011-05-18 05:17:37 +0000 (1457e83)
@@ -0,0 +1 @@
+include $(abs_top_srcdir)/build/makefiles/gettext.mk
Copied: doc/locale/tempalte.locale.Makefile.am (+2 -0) 78%
===================================================================
--- doc/locale/ja/Makefile.am 2011-05-18 03:47:50 +0000 (2575d12)
+++ doc/locale/tempalte.locale.Makefile.am 2011-05-18 05:17:37 +0000 (ad9a686)
@@ -1,3 +1,5 @@
SUBDIRS = LC_MESSAGES
+LOCALE = %LOCALE%
+
include $(top_srcdir)/build/makefiles/sphinx.mk