Commit 4be333e4 authored by Daniel Elstner's avatar Daniel Elstner
Browse files

Execute glib-gettextize and intltoolize.

* autogen.sh: Execute glib-gettextize and intltoolize.

* configure.ac: Call AC_PROG_INTLTOOL().  Assign ALL_LINGUAS and
GETTEXT_PACKAGE, and do an AC_SUBST() of the latter.
(AM_GNU_GETTEXT): Use AM_GLIB_GNU_GETTEXT() instead.

* Makefile.am (dist_desktop_DATA): Remove the dist_ prefix,
introduce desktop_in_files, and add the @INTLTOOL_DESKTOP_RULE@
substitution in order to make regexxer intltool-aware.
(dist_schema_DATA): Likewise for the GConf schemas file.
(dist_noinst_SCRIPTS): Add intltool-extract.in, intltool-merge.in
and intltool-update.in.

* regexxer.desktop: Rename to regexxer.desktop.in, use _Comment
instead of Comment, and remove the manually inserted de and dk
translations.

* regexxer.schemas: Rename to regexxer.schemas.in.
parent b696e895
......@@ -8,6 +8,14 @@ config.h.in
config.log
config.status
configure
intltool-extract
intltool-extract.in
intltool-merge
intltool-merge.in
intltool-update
intltool-update.in
regexxer.desktop
regexxer.schemas
stamp-h1
stamp-h.in
regexxer-*.tar.bz2
......
2004-05-17 Daniel Elstner <daniel.elstner@gmx.net>
* autogen.sh: Execute glib-gettextize and intltoolize.
* configure.ac: Call AC_PROG_INTLTOOL(). Assign ALL_LINGUAS and
GETTEXT_PACKAGE, and do an AC_SUBST() of the latter.
(AM_GNU_GETTEXT): Use AM_GLIB_GNU_GETTEXT() instead.
* Makefile.am (dist_desktop_DATA): Remove the dist_ prefix,
introduce desktop_in_files, and add the @INTLTOOL_DESKTOP_RULE@
substitution in order to make regexxer intltool-aware.
(dist_schema_DATA): Likewise for the GConf schemas file.
(dist_noinst_SCRIPTS): Add intltool-extract.in, intltool-merge.in
and intltool-update.in.
* regexxer.desktop: Rename to regexxer.desktop.in, use _Comment
instead of Comment, and remove the manually inserted de and dk
translations.
* regexxer.schemas: Rename to regexxer.schemas.in.
2004-05-17 Daniel Elstner <daniel.elstner@gmx.net>
* src/filetreeprivate.cc (collatekey_sort_func): Use libstdc++-v3
......
......@@ -23,14 +23,20 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --enable-warnings=hardcore
SUBDIRS = pixmaps ui src po
dist_noinst_SCRIPTS = autogen.sh config.rpath
dist_noinst_DATA = macros/cxx.m4 macros/misc.m4 macros/pcre.m4
desktop_in_files = regexxer.desktop.in
desktopdir = $(datadir)/applications
dist_desktop_DATA = regexxer.desktop
desktop_DATA = regexxer.desktop
@INTLTOOL_DESKTOP_RULE@
schemas_in_files = regexxer.schemas.in
schemasdir = $(GCONF_SCHEMA_FILE_DIR)
schemas_DATA = regexxer.schemas
@INTLTOOL_SCHEMAS_RULE@
schemadir = $(GCONF_SCHEMA_FILE_DIR)
dist_schema_DATA = regexxer.schemas
dist_noinst_SCRIPTS = autogen.sh config.rpath intltool-extract.in intltool-merge.in intltool-update.in
dist_noinst_DATA = $(desktop_in_files) $(schemas_in_files) macros/cxx.m4 macros/misc.m4 macros/pcre.m4
gconftool_command = GCONF_CONFIG_SOURCE='$(GCONF_SCHEMA_CONFIG_SOURCE)' $(GCONFTOOL)
......@@ -42,9 +48,9 @@ install-data-hook:
uninstall-hook:
endif
install-schemas: $(dist_schema_DATA)
install-schemas: $(schemas_DATA)
@$(POST_INSTALL)
@file='$(dist_schema_DATA)'; test -f "$$file" || file="$(srcdir)/$$file"; \
@file='$(schemas_DATA)'; test -f "$$file" || file="$(srcdir)/$$file"; \
echo " $(gconftool_command) --makefile-install-rule $$file"; \
$(gconftool_command) --makefile-install-rule $$file
@echo; \
......@@ -58,7 +64,7 @@ install-schemas: $(dist_schema_DATA)
uninstall-schemas:
@$(NORMAL_UNINSTALL)
@file='$(dist_schema_DATA)'; test -f "$$file" || file="$(srcdir)/$$file"; \
@file='$(schemas_DATA)'; test -f "$$file" || file="$(srcdir)/$$file"; \
echo " $(gconftool_command) --makefile-uninstall-rule $$file"; \
$(gconftool_command) --makefile-uninstall-rule $$file
......@@ -86,6 +86,7 @@ then
exit 1
fi
rm -f intltool-extract.in intltool-merge.in intltool-update.in po/Makefile.in.in
rm -f config.guess config.sub depcomp install-sh missing
rm -f config.cache acconfig.h
rm -rf autom4te.cache
......@@ -98,6 +99,8 @@ test -n "${BASH_VERSION+set}" && set_option='set'
$set_option -x
glib-gettextize --copy || exit 1
intltoolize --automake || exit 1
"$aclocal" $ACLOCAL_FLAGS || exit 1
"$autoheader" || exit 1
"$automake" $AUTOMAKE_FLAGS || exit 1
......
......@@ -30,7 +30,10 @@ AM_INIT_AUTOMAKE([1.7 gnu no-define nostdinc check-news])
AC_PROG_CC()
AC_PROG_CXX()
AM_GNU_GETTEXT([external])
AC_PROG_INTLTOOL([0.23])
ALL_LINGUAS='de en'
AC_SUBST([GETTEXT_PACKAGE], ['regexxer'])
AM_GLIB_GNU_GETTEXT()
PKG_CHECK_MODULES([PKG], [gtkmm-2.4 >= 2.4.0 libglademm-2.4 >= 2.4.0 gconfmm-2.6 >= 2.6.1])
AC_SUBST([PKG_CFLAGS])
......
[Desktop Entry]
Encoding=UTF-8
Name=regexxer
Comment=An interactive tool for performing search and replace operations
Comment[da]=Et interaktivt værktøj til at udføre søg og erstat handlinger
Comment[de]=Ein interaktives Werkzeug zum Suchen und Ersetzen
_Comment=An interactive tool for performing search and replace operations
Exec=regexxer
Icon=regexxer.png
Terminal=false
......
......@@ -72,7 +72,7 @@
<long>
Name of the character encoding to use if a file is not readable
in either UTF-8 or the codeset specified by the current locale.
Try `iconv --list&apos; for a complete list of possible values.
Try &quot;iconv --list&quot; for a complete list of possible values.
</long>
</locale>
</schema>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment