diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2007-04-25 21:40:57 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2007-04-25 21:40:57 (GMT) |
| commit | ed8229075e762c7b5bbaec6d2f67442c30efc8b9 (patch) | |
| tree | cebe1449697bd7511c1ee0bd8ecf1fbeb57b1618 | |
| parent | aa4d77a64b42de5511ad89ceb1c7b1e8fb0fd248 (diff) | |
Fixed missing macosx reverted website mode
* Makefile.am: Fixed missing macosx
* boards/Makefile.am: reverted website mode
svn path=/trunk/; revision=2621
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | boards/Makefile.am | 6 | ||||
| -rw-r--r-- | configure.in | 2 |
4 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,10 @@ +2007-04-25 Bruno coudoin <bruno.coudoin@free.fr> + + * Makefile.am: Fixed missing macosx + * boards/Makefile.am: reverted website mode + + *** RELEASE 8.3BETA3 *** + 2007-04-24 Bruno coudoin <bruno.coudoin@free.fr> bug#33008 New: Updated Bulgarian (bg) translation diff --git a/Makefile.am b/Makefile.am index c43e7be..a8ae8e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,7 @@ else DOCS_SUBDIR= endif -SUBDIRS = po src boards $(DOCS_SUBDIR) autopackage +SUBDIRS = po src boards $(DOCS_SUBDIR) autopackage macosx #if OS_MACOSX #SUBDIRS += macosx diff --git a/boards/Makefile.am b/boards/Makefile.am index ea6dbb7..81c2c4e 100644 --- a/boards/Makefile.am +++ b/boards/Makefile.am @@ -144,11 +144,11 @@ xml_DATA = $(xml_in_files:.xml.in=.xml) # in the file themselves. GCompris pick the translations from the po file at # runtime. # -#$(xml_DATA): %.xml: %.xml.in -# sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@ +$(xml_DATA): %.xml: %.xml.in + sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@ # Use this directive and instead of the one above to embed the translations # in the xml files directly, this is needed for the tool gcompris2spip -@INTLTOOL_XML_RULE@ +#@INTLTOOL_XML_RULE@ CLEANFILES = $(xml_DATA) diff --git a/configure.in b/configure.in index e2a4407..b4fac55 100644 --- a/configure.in +++ b/configure.in @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/gcompris/gcompris.c) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(gcompris, 8.3BETA3) +AM_INIT_AUTOMAKE(gcompris, 8.3) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE |