Commit dddf937a authored by Daniel Elstner's avatar Daniel Elstner
Browse files

Define REGEXXER_LOCALEDIR to the "$(locale)" directory path. Remove define

* Makefile.am (global_defs): Define REGEXXER_LOCALEDIR to the
"$(locale)" directory path.  Remove define for REGEXXER_DATADIR
since it was used only as part of the locale directory.
* src/main.cc (main): Use REGEXXER_LOCALEDIR.
(locale_directory): Remove string literal.

svn path=/trunk/; revision=626
parent 059341ce
2007-01-11 Daniel Elstner <daniel.kitta@gmail.com>
* Makefile.am (global_defs): Define REGEXXER_LOCALEDIR to the
"$(locale)" directory path. Remove define for REGEXXER_DATADIR
since it was used only as part of the locale directory.
* src/main.cc (main): Use REGEXXER_LOCALEDIR.
(locale_directory): Remove string literal.
2007-01-11 Daniel Elstner <daniel.kitta@gmail.com>
* ui/prefdialog.glade (label_toolbar_style): Assign mnemonic widget
......
......@@ -70,7 +70,7 @@ nodist_src_regexxer_SOURCES = \
ui/stockimages.h
global_defs = \
-DREGEXXER_DATADIR=\""$(datadir)"\" \
-DREGEXXER_LOCALEDIR=\""$(localedir)"\" \
-DREGEXXER_PKGDATADIR=\""$(pkgdatadir)"\" \
-DREGEXXER_GCONF_DIRECTORY=\""$(REGEXXER_GCONF_DIRECTORY)"\" \
-DGLIBMM_DISABLE_DEPRECATED -DGTKMM_DISABLE_DEPRECATED
......
......@@ -94,8 +94,6 @@ const StockItemData regexxer_stock_items[] =
{ "regexxer-save-all", stock_icon_save_all, G_N_ELEMENTS(stock_icon_save_all), N_("Save _all") }
};
const char *const locale_directory = REGEXXER_DATADIR G_DIR_SEPARATOR_S "locale";
// static
Glib::OptionEntry RegexxerOptions::entry(const char* long_name, char short_name,
const char* description, const char* arg_description)
......@@ -234,7 +232,7 @@ int main(int argc, char** argv)
{
try
{
Util::initialize_gettext(PACKAGE_TARNAME, locale_directory);
Util::initialize_gettext(PACKAGE_TARNAME, REGEXXER_LOCALEDIR);
Gnome::Conf::init();
std::auto_ptr<RegexxerOptions> options = RegexxerOptions::create();
......
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