diff --git a/data/iso-codes/Makefile.am b/data/iso-codes/Makefile.am index e5ddfc030..3a4cc9aad 100644 --- a/data/iso-codes/Makefile.am +++ b/data/iso-codes/Makefile.am @@ -1,4 +1,4 @@ -installdir = $(datadir)/iso-codes +installdir = $(DATADIR)/iso-codes install_DATA = \ iso-639.tab diff --git a/src/system/localize.cpp b/src/system/localize.cpp index 63f562437..fd0a9c516 100644 --- a/src/system/localize.cpp +++ b/src/system/localize.cpp @@ -48,8 +48,10 @@ #include #include +#define ISO_639_TAB DATADIR "/iso-codes/iso-639.tab" //static const char * iso639filename = "/usr/share/iso-codes/iso-639.tab"; -static const char * iso639filename = "/share/iso-codes/iso-639.tab"; +//static const char * iso639filename = "/share/iso-codes/iso-639.tab"; +static const char * iso639filename = ISO_639_TAB; #define DEFAULT_LOCALE "english"