Index: trunk/Ohana/src/opihi/pcontrol/pcontrol.c
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/pcontrol.c	(revision 10693)
+++ trunk/Ohana/src/opihi/pcontrol/pcontrol.c	(revision 11084)
@@ -44,6 +44,21 @@
   set_str_variable ("RCFILE", opihi_rcfile);
 
-# ifdef HELPDIR_DEFAULT
-  set_str_variable ("HELPDIR", MACRO_NAME(HELPDIR_DEFAULT));
+# ifdef DATADIR_DEFAULT
+  {
+    char *datadir;
+    char *helpdir;
+    char *modules;
+    datadir = MACRO_NAME(DATADIR_DEFAULT);
+    /* set_str_variable ("DATADIR", datadir); */
+    ALLOCATE (helpdir, char, strlen(datadir) + strlen("/help") + 2);
+    sprintf (helpdir, "%s/help", datadir);
+    set_str_variable ("HELPDIR", helpdir);
+    free (helpdir);
+    ALLOCATE (modules, char, strlen(datadir) + strlen("/modules") + 2);
+    sprintf (modules, "%s/modules", datadir);
+    set_str_variable ("MODULES:0", modules);
+    set_int_variable ("MODULES:n", 1);
+    free (helpdir);
+  }
 # endif