Fix up problems when compiling in a directory other than the source

directory.

Grammar/Makefile → Grammar/Makefile.in

+# NOTE: Makefile.in is converted into Makefile by the configure script
+# in the parent directory.  Once configure has run, you can recreate
+# the Makefile by running just config.status.
+
+# === Variables set by config.stat ===
+
+VERSION=	@VERSION@
+
+srcdir=		@srcdir@
+VPATH=		@srcdir@
+
+CC=		@CC@
+RANLIB=		@RANLIB@
+AR=		@AR@
+
+DEFS=		@DEFS@
+LIBS=		@LIBS@
+
+
+# === Fixed definitions ===
+
 TOP=		..
 PGENDIR=	$(TOP)/Parser
 PGEN=		$(PGENDIR)/pgen
-DESTH=		$(TOP)/Include/graminit.h
-DESTC=		$(TOP)/Python/graminit.c
+DESTH=		$(srcdir)/$(TOP)/Include/graminit.h
+DESTC=		$(srcdir)/$(TOP)/Python/graminit.c
 
 all:		install
 
@@ -20,10 +41,10 @@ $(DESTC):	graminit.c
 		cp graminit.c $(DESTC)
 
 graminit.c graminit.h: $(PGEN) Grammar
-		$(PGEN) Grammar
+		$(PGEN) $(srcdir)/Grammar
 
 $(PGEN):
-		cd $(PGENDIR); make pgen
+		cd $(PGENDIR); $(MAKE) pgen
 
 clean:
 		-rm -f *.o core *~ [@,#]* *.old *.orig *.rej

Makefile.in

@@ -196,8 +196,7 @@ libpython$(VERSION).dylib: $(LIBRARY)
 $(SUBDIRS):	Makefiles
 
 Grammar:
-		P=`pwd`/Parser; cd $(srcdir)/Grammar; $(MAKE) PGENDIR=$$P \
-			OPT="$(OPT)" VERSION="$(VERSION)" \
+		cd Grammar ; $(MAKE) OPT="$(OPT)" VERSION="$(VERSION)" \
 			prefix="$(prefix)" exec_prefix="$(exec_prefix)" all
 
 Parser:

configure.in

@@ -1167,6 +1167,7 @@ AC_CHECK_TYPE(socklen_t, int)
 AC_OUTPUT(Makefile \
  Objects/Makefile \
  Parser/Makefile \
+ Grammar/Makefile \
  Python/Makefile \
  Modules/Makefile.pre \
  Modules/Setup.config)