X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=pwm%2Fpwm.c;h=178cf76c3ffbc340c5cfa1bc7af363682c4ef576;hp=a96e3067701a02e3755421596135b52ce861c6a6;hb=f869221ce49f0fb7cca48eee28daff8684305963;hpb=720e6978185b09f2b2f60a6b96018238085a7238 diff --git a/pwm/pwm.c b/pwm/pwm.c index a96e306..178cf76 100644 --- a/pwm/pwm.c +++ b/pwm/pwm.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -93,20 +94,30 @@ int main(int argc, char*argv[]) char *efnam=NULL; bool may_continue=FALSE; bool noerrorlog=FALSE; - + char *localedir; + libtu_init(argv[0]); - if(!ioncore_init("pwm3", argc, argv, LOCALEDIR)) +#ifdef CF_RELOCATABLE + prefix_set(argv[0], PWM3_LOCATION); +#endif + + localedir=prefix_add(LOCALEDIR); + + if(!ioncore_init("pwm3", argc, argv, localedir)) return EXIT_FAILURE; - extl_add_searchdir(EXTRABINDIR); /* ion-completefile */ - extl_add_searchdir(MODULEDIR); - extl_add_searchdir(ETCDIR); + if(localedir!=NULL) + free(localedir); + + prefix_wrap_simple(extl_add_searchdir, EXTRABINDIR); /* ion-completefile */ + prefix_wrap_simple(extl_add_searchdir, MODULEDIR); + prefix_wrap_simple(extl_add_searchdir, ETCDIR); #ifdef PWM_ETCDIR - extl_add_searchdir(PWM_ETCDIR); + prefix_wrap_simple(extl_add_searchdir, PWM_ETCDIR); #endif - extl_add_searchdir(SHAREDIR); - extl_add_searchdir(LCDIR); + prefix_wrap_simple(extl_add_searchdir, SHAREDIR); + prefix_wrap_simple(extl_add_searchdir, LCDIR); extl_set_userdirs("pwm3"); optparser_init(argc, argv, OPTP_MIDLONG, pwm_opts);