[Nickle] nickle: Branch 'master' - 2 commits

[Bart Massey]

 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 84f404bfbd19c460c559717f8d9f4f20ed92a3dc
Merge: 992ed90... 0eb4259...
Author: Bart Massey <bart at cs.pdx.edu>
Date:   Thu Feb 19 13:21:04 2009 -0800

    Merge branch 'master' of ssh://keithp.com/git/nickle

commit 992ed90e64cbe1cc9cc703dbcfaa64bc5ab6fe6e
Author: Bart Massey <bart at cs.pdx.edu>
Date:   Thu Feb 19 13:20:09 2009 -0800

    Removed redundant gram.y in YACCCOMPILE
    
    This was preventing current autotools from compiling the
    grammar with byacc.

diff --git a/Makefile.am b/Makefile.am
index c4f39a2..168115e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,7 +85,7 @@ USES_GRAM_H = \
 
 $(USES_GRAM_H): gram.h
 
-YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) gram.y && sed -i 's/^short yy/static const short yy/' y.tab.c && echo
+YACCCOMPILE = $(YACC) $(YFLAGS) $(AM_YFLAGS) && sed -i 's/^short yy/static const short yy/' y.tab.c && echo
 
 builtin.o main.o: Makefile