2 files changed, 15 insertions, 6 deletions

diff --git a/README.submodule b/README.submodule
index e04a4ec..9b7212f 100644
--- a/README.submodule
+++ b/README.submodule
@@ -34,23 +34,32 @@ recursively, joining several trees together, reductions, etc.
 
    git submodule add git://git.gnu.org.ua/grecs.git grecs
 
-2. Add a call to GRECS_SETUP to your configure.ac.  It can be as
+2. Modify your configure.ac
+
+First, indicate that grecs/am is the location of additional Autoconf
+macros. To do so, add the following statement
+
+   AC_CONFIG_MACRO_DIR([grecs/am])
+
+Somewhere below this statement, add a call to GRECS_SETUP.  It can be as
 simple as:
 
    GRECS_SETUP
 
 If the subproject directory is not 'grecs', supply the actual
-directory name as the first argument to this macro, e.g.:
+directory name as the first argument to both this macro, and
+AC_CONFIG_MACRO_DIR, e.g.:
 
-   GRECS_SETUP(lib/grecs)
+   AC_CONFIG_MACRO_DIR([lib/grecs/am])
+   GRECS_SETUP([lib/grecs])
 
 For a detailed description of the GRECS_SETUP macro, run
 `man doc/GRECS_SETUP.3'.
 
-3. In your Makefile.am, add @GRECS_INCLUDES@ to the INCLUDES value,
+3. In your Makefile.am, add @GRECS_INCLUDES@ to the AM_CPPFLAGS value,
 and @GRECS_LDADD@ to LDADD, e.g.:
 
-   INCLUDES = @GRECS_INCLUDES@
+   AM_CPPFLAGS = @GRECS_INCLUDES@
    LDADD = @GRECS_LDADD@
    
 4. Include "grecs.h"
diff --git a/include/wordsplit.h b/include/wordsplit.h
index d8cd461..8726cf1 100644
--- a/include/wordsplit.h
+++ b/include/wordsplit.h
@@ -39,7 +39,7 @@ struct wordsplit
                                elements in ws_wordv to fill with NULLs. */
   size_t ws_wordn;          /* Number of elements ws_wordv can accomodate. */ 
   int ws_flags;             /* [Input] Flags passed to wordsplit. */
-  int ws_options;           /* [Input] (WRDSF_PATHEXPAND)
+  int ws_options;           /* [Input] (WRDSF_OPTIONS)
                                Additional options. */
   const char *ws_delim;     /* [Input] (WRDSF_DELIM) Word delimiters. */
   const char *ws_comment;   /* [Input] (WRDSF_COMMENT) Comment characters. */