Commit v4.5.2

Makefile.in

@@ -62,45 +62,57 @@ MAKE_GMP=@MAKE_GMP@
 ifndef GMP_VER
  GMP_VER=@GMP_VER@
 endif
-ifndef BUILD_MODE
- BUILD_MODE=@BUILD_MODE@
+ifndef ABI
+ ABI=@ABI@
 endif
 ABI_CFLAGS=@ABI_CFLAGS@
 export CFLAGS+=@ABI_CFLAGS@ @CFLAGS@
-export JENKINS_CFLAGS=@JENKINS_CFLAGS@
 export NOREADLINE=@NOREADLINE@
 export READLINEPREFIX=@READLINEPREFIX@
+ifndef CONFIGNAME
+ CONFIGNAME=@CONFIGNAME@
+endif
 
-TESTGAP = ./bin/gap.sh -b -m 100m -o 512m -A -N -q -x 80 -r
-TESTGAPauto = ./bin/gap.sh -b -m 100m -o 512m -N -q -x 80 -r
+TESTGAP = ./bin/gap-$(CONFIGNAME).sh -b -m 100m -o 512m -A -N -q -x 80 -r
+TESTGAPauto = ./bin/gap-$(CONFIGNAME).sh -b -m 100m -o 512m -N -q -x 80 -r
 
 default: compile
 
-config: bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure  bin/@target@-@BASECC@/$(BUILD_MODE)-bit/Makefile bin/@target@-@BASECC@/$(BUILD_MODE)-bit/extern/Makefile 
+setconfig:
+	if test -e sysinfo.gap-$(CONFIGNAME); then \
+	  rm -f Makefile sysinfo.gap bin/gap.sh; \
+	  ln -s sysinfo.gap-$(CONFIGNAME) sysinfo.gap; \
+	  ln -s Makefile-$(CONFIGNAME) Makefile; \
+	  ln -s gap-$(CONFIGNAME).sh bin/gap.sh; \
+	else \
+	  echo "There is no config with name: "$(CONFIGNAME); \
+	fi;
+
+config: bin/@target@-@BASECC@-$(CONFIGNAME)/configure  bin/@target@-@BASECC@-$(CONFIGNAME)/Makefile bin/@target@-@BASECC@-$(CONFIGNAME)/extern/Makefile 
 
-bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure: cnf/configure.out 
-	mkdir -p bin/@target@-@BASECC@/$(BUILD_MODE)-bit
-	@rm -f bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure
-	cp cnf/configure.out bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure
+bin/@target@-@BASECC@-$(CONFIGNAME)/configure: cnf/configure.out 
+	mkdir -p bin/@target@-@BASECC@-$(CONFIGNAME)
+	@rm -f bin/@target@-@BASECC@-$(CONFIGNAME)/configure
+	cp cnf/configure.out bin/@target@-@BASECC@-$(CONFIGNAME)/configure
 
-bin/@target@-@BASECC@/$(BUILD_MODE)-bit/Makefile bin/@target@-@BASECC@/$(BUILD_MODE)-bit/extern/Makefile : bin/@target@-@BASECC@/$(BUILD_MODE)-bit/configure cnf/config.hin cnf/gac.in extern/Makefile.in cnf/Makegap.in
-	mkdir -p bin/@target@-@BASECC@/$(BUILD_MODE)-bit/extern
-	( cd bin/@target@-@BASECC@/$(BUILD_MODE)-bit ; CC='$(CC)' BUILD_MODE='$(BUILD_MODE)' ABI_CFLAGS='$(ABI_CFLAGS)' GMP_LIBS='$(GMP_LIBS)' NOREADLINE='$(NOREADLINE)' READLINEPREFIX='$(READLINEPREFIX)' ./configure --target=@target@ @gp_configure_options@ )
+bin/@target@-@BASECC@-$(CONFIGNAME)/Makefile bin/@target@-@BASECC@-$(CONFIGNAME)/extern/Makefile : bin/@target@-@BASECC@-$(CONFIGNAME)/configure cnf/config.hin cnf/gac.in extern/Makefile.in cnf/Makegap.in
+	mkdir -p bin/@target@-@BASECC@-$(CONFIGNAME)/extern
+	( cd bin/@target@-@BASECC@-$(CONFIGNAME) ; CC='$(CC)' ABI='$(ABI)' ABI_CFLAGS='$(ABI_CFLAGS)' GMP_LIBS='$(GMP_LIBS)' NOREADLINE='$(NOREADLINE)' READLINEPREFIX='$(READLINEPREFIX)' CONFIGNAME='$(CONFIGNAME)' ./configure --target=@target@ @gp_configure_options@ )
 
 extern: config
-	( cd bin/@target@-@BASECC@/$(BUILD_MODE)-bit/extern ; $(MAKE) TARGET='$(TARGET)' BASECC='$(BASECC)' BUILD_MODE='$(BUILD_MODE)' ABI_CFLAGS='$(ABI_CFLAGS)' CC='$(CC)' GMP_VER='$(GMP_VER)' MAKE_GMP='$(MAKE_GMP)' )
+	( cd bin/@target@-@BASECC@-$(CONFIGNAME)/extern ; $(MAKE) TARGET='$(TARGET)' BASECC='$(BASECC)' ABI='$(ABI)' ABI_CFLAGS='$(ABI_CFLAGS)' CC='$(CC)' GMP_VER='$(GMP_VER)' MAKE_GMP='$(MAKE_GMP)' CONFIGNAME='$(CONFIGNAME)' )
 
 compile: extern
-	( cd bin/@target@-@BASECC@/$(BUILD_MODE)-bit ; $(MAKE) BUILD_MODE='$(BUILD_MODE)' CC='$(CC)' GMP_VER='$(GMP_VER)' GMP_CFLAGS='$(GMP_CFLAGS)' GMP_LIBS='$(GMP_LIBS)' READLINEPREFIX='$(READLINEPREFIX)'  NOREADLINE='$(NOREADLINE)'  )
-	chmod +x bin/gap$(BUILD_MODE).sh
+	( cd bin/@target@-@BASECC@-$(CONFIGNAME); $(MAKE) ABI='$(ABI)' CC='$(CC)' GMP_VER='$(GMP_VER)' GMP_CFLAGS='$(GMP_CFLAGS)' GMP_LIBS='$(GMP_LIBS)' READLINEPREFIX='$(READLINEPREFIX)'  NOREADLINE='$(NOREADLINE)' CONFIGNAME='$(CONFIGNAME)' )
+	chmod +x bin/gap-$(CONFIGNAME).sh
 
 static: extern
-	( cd bin/@target@-@BASECC@/$(BUILD_MODE)-bit ; $(MAKE) static CC='$(CC)' BUILD_MODE='$(BUILD_MODE)' )
+	( cd bin/@target@-@BASECC@-$(CONFIGNAME) ; $(MAKE) static CC='$(CC)' ABI='$(ABI)' )
 	chmod +x bin/gap.sh
-	( cd bin/@target@-@BASECC@/$(BUILD_MODE)-bit ; strip gap@EXEEXT@)
+	( cd bin/@target@-@BASECC@-$(CONFIGNAME) ; strip gap@EXEEXT@)
 
 strip: compile
-	if ! grep darwin sysinfo.gap ; then ( cd bin/@target@-@BASECC@/$(BUILD_MODE)-bit ; strip gap@EXEEXT@) ; fi
+	if ! grep darwin sysinfo.gap ; then ( cd bin/@target@-@BASECC@-$(CONFIGNAME); strip gap@EXEEXT@) ; fi
 
 removewin: strip
 	( rm -f bin/*.exe bin/*.dll bin/*.bat bin/*.pif "bin/GAP 4 PPC")
@@ -109,63 +121,52 @@ rebuild:
 	rm -f config.cache config.log config.status
 	touch src/*
 
-allclean: clean32 clean64
-
-clean: clean$(BUILD_MODE)
-
-clean32: clean_gap32 clean_gmp32 clean_jenkins32
-
-clean64: clean_gap64 clean_gmp64 clean_jenkins64
-
-clean_gap: clean_gap$(BUILD_MODE)
-
-clean_gap32: rebuild
-	rm -f bin/@target@-@BASECC@/32-bit/*.o
-	rm -f bin/@target@-@BASECC@/32-bit/Makefile
-	rm -f bin/@target@-@BASECC@/32-bit/config*
-	rm -f bin/@target@-@BASECC@/32-bit/gac
-	rm -f bin/@target@-@BASECC@/32-bit/gap
-	rm -f bin/gap32.sh
-	rm -f Makefile
-
-clean_gap64: rebuild
-	rm -f bin/@target@-@BASECC@/64-bit/*.o
-	rm -f bin/@target@-@BASECC@/64-bit/Makefile
-	rm -f bin/@target@-@BASECC@/64-bit/config*
-	rm -f bin/@target@-@BASECC@/64-bit/gac
-	rm -f bin/@target@-@BASECC@/64-bit/gap
-	rm -f bin/gap64.sh
-	rm -f Makefile
-
-clean_gmp: clean_gmp$(BUILD_MODE)
-
-clean_gmp32:
-	if test -d bin/@target@-@BASECC@/32-bit/extern/gmp-$(GMP_VER); then \
-	 rm -rf bin/@target@-@BASECC@/32-bit/extern/gmp-$(GMP_VER); fi
-	if test -h bin/@target@-@BASECC@/32-bit/extern/gmp; then \
-	 rm -f bin/@target@-@BASECC@/32-bit/extern/gmp; fi
-	if test -d extern/gmp-$(GMP_VER); then \
-	 (cd extern/gmp-$(GMP_VER); rm -f LASTBUILD.*; \
-	  if test -r Makefile; then make distclean; fi ); fi
+ifndef CLEANME
+ CLEANME=@CONFIGNAME@
+endif
 
-clean_gmp64:
-	if test -d bin/@target@-@BASECC@/64-bit/extern/gmp-$(GMP_VER); then \
-	 rm -rf bin/@target@-@BASECC@/64-bit/extern/gmp-$(GMP_VER); fi
-	if test -h bin/@target@-@BASECC@/64-bit/extern/gmp; then \
-	 rm -f bin/@target@-@BASECC@/64-bit/extern/gmp; fi
+clean: clean_$(CLEANME)
+
+clean_$(CLEANME): clean_gap_$(CLEANME) clean_gmp_$(CLEANME)
+	rm -rf bin/@target@-@BASECC@-$(CONFIGNAME)
+
+
+clean_gap: clean_gap_$(CLEANME)
+
+clean_gap_$(CLEANME): rebuild
+	rm -f bin/@target@-@BASECC@-$(CONFIGNAME)/*.o
+	rm -f bin/@target@-@BASECC@-$(CONFIGNAME)/Makefile
+	rm -f bin/@target@-@BASECC@-$(CONFIGNAME)/config*
+	rm -f bin/@target@-@BASECC@-$(CONFIGNAME)/gac
+	rm -f bin/@target@-@BASECC@-$(CONFIGNAME)/gap
+	rm -f bin/@target@-@BASECC@-$(CONFIGNAME)/sysinfo*
+	rm -f bin/gap-$(CONFIGNAME).sh
+	rm -f sysinfo.gap-$(CONFIGNAME)
+	(if ! test -h sysinfo.gap -a -e sysinfo.gap; then \
+	  nextconf=`ls sysinfo.gap-* 2>/dev/null | head -1 | \
+	          sed -e "s/sysinfo.gap-//g"`; \
+	  if [ "x$$nextconf" != "x" ]; then \
+	    echo "changing config to "$$nextconf; \
+	    make setconfig CONFIGNAME=$$nextconf; \
+	  else \
+	    rm -f Makefile sysinfo.gap bin/gap.sh; \
+	  fi; \
+	fi)
+	rm -f Makefile-$(CONFIGNAME)
+
+clean_gmp: clean_gmp_$(CLEANME)
+
+clean_gmp_$(CLEANME):
+	if test -d bin/@target@-@BASECC@-$(CONFIGNAME)/extern/gmp-$(GMP_VER); then \
+	 rm -rf bin/@target@-@BASECC@-$(CONFIGNAME)/extern/gmp-$(GMP_VER); fi
+	if test -h bin/@target@-@BASECC@-$(CONFIGNAME)/extern/gmp; then \
+	 rm -f bin/@target@-@BASECC@-$(CONFIGNAME)/extern/gmp; fi
 	if test -d extern/gmp-$(GMP_VER); then \
 	 (cd extern/gmp-$(GMP_VER); rm -f LASTBUILD.*; \
 	  if test -r Makefile; then make distclean; fi ); fi
 
-clean_jenkins: clean_jenkins$(BUILD_MODE)
-
-clean_jenkins32:
-	if test -d bin/@target@-@BASECC@/32-bit/extern/jenkins; \
-	 then rm -rf bin/@target@-@BASECC@/32-bit/extern/jenkins; fi
-
-clean_jenkins64:
-	if test -d bin/@target@-@BASECC@/64-bit/extern/jenkins; \
-	 then rm -rf bin/@target@-@BASECC@/64-bit/extern/jenkins; fi
+distclean:
+	while test -e Makefile; do make clean; done
 
 manuals:
 	( echo 'SaveWorkspace( "doc/wsp.g" );' | $(TESTGAPauto) )
@@ -233,20 +234,38 @@ testpackagesload:
             SaveWorkspace( "wsp.g" );' | $(TESTGAP) )
 	( echo 'CreatePackageLoadTestsInput( "testpackagesload.in", \
             "dev/log/testpackagesload1", \
-            "$(TESTGAP) -L wsp.g", false );'\
+            "$(TESTGAP) -L wsp.g", false, false );'\
             | $(TESTGAP) -L wsp.g > /dev/null )
 	( chmod 777 testpackagesload.in; ./testpackagesload.in > \
             `date -u +dev/log/testpackagesload1_%Y-%m-%d-%H-%M`; rm testpackagesload.in )
+	( rm wsp.g )
+	( echo 'ReadGapRoot( "tst/testutil.g" ); \
+            SaveWorkspace( "wsp.g" );' | $(TESTGAP) )
+	( echo 'CreatePackageLoadTestsInput( "testpackagesload.in", \
+            "dev/log/testpackagesloadN1", \
+            "$(TESTGAP) -L wsp.g", false, true );'\
+            | $(TESTGAP) -L wsp.g > /dev/null )
+	( chmod 777 testpackagesload.in; ./testpackagesload.in > \
+            `date -u +dev/log/testpackagesloadN1_%Y-%m-%d-%H-%M`; rm testpackagesload.in )
 	( rm wsp.g )	
 	( echo 'ReadGapRoot( "tst/testutil.g" ); \
             SaveWorkspace( "wsp.g" );' | $(TESTGAPauto) )
 	( echo 'CreatePackageLoadTestsInput( "testpackagesload.in", \
             "testpackagesloadA", \
-            "$(TESTGAPauto) -L wsp.g", true );'\
+            "$(TESTGAPauto) -L wsp.g", true, false );'\
             | $(TESTGAPauto) -L wsp.g > /dev/null )
 	( chmod 777 testpackagesload.in; ./testpackagesload.in > \
             `date -u +dev/log/testpackagesloadA_%Y-%m-%d-%H-%M`; rm testpackagesload.in )
 	( rm wsp.g )
+	( echo 'ReadGapRoot( "tst/testutil.g" ); \
+            SaveWorkspace( "wsp.g" );' | $(TESTGAPauto) )
+	( echo 'CreatePackageLoadTestsInput( "testpackagesload.in", \
+            "testpackagesloadNA", \
+            "$(TESTGAPauto) -L wsp.g", true, true );'\
+            | $(TESTGAPauto) -L wsp.g > /dev/null )
+	( chmod 777 testpackagesload.in; ./testpackagesload.in > \
+            `date -u +dev/log/testpackagesloadNA_%Y-%m-%d-%H-%M`; rm testpackagesload.in )
+	( rm wsp.g )
 
 testmanuals:
 	mkdir -p dev/log
@@ -282,9 +301,9 @@ testmanuals:
 	( rm doc/test/wsp.g )
 
 cygwin:	extern
-	( cd bin/@target@-@BASECC@/$(BUILD_MODE)-bit ; $(MAKE) gapdll BUILD_MODE='$(BUILD_MODE)' CC='$(CC)' GMP_VER='$(GMP_VER)' GMP_CFLAGS='$(GMP_CFLAGS)' GMP_LIBS='$(GMP_LIBS)' READLINEPREFIX='$(READLINEPREFIX)'  NOREADLINE='$(NOREADLINE)'  )
-	cp bin/@target@-@BASECC@/$(BUILD_MODE)-bit/gapw95.exe bin
-	cp bin/@target@-@BASECC@/$(BUILD_MODE)-bit/gap.dll bin
+	( cd bin/@target@-@BASECC@-$(CONFIGNAME) ; $(MAKE) gapdll ABI='$(ABI)' CC='$(CC)' GMP_VER='$(GMP_VER)' GMP_CFLAGS='$(GMP_CFLAGS)' GMP_LIBS='$(GMP_LIBS)' READLINEPREFIX='$(READLINEPREFIX)'  NOREADLINE='$(NOREADLINE)'  )
+	cp bin/@target@-@BASECC@-$(CONFIGNAME)/gapw95.exe bin
+	cp bin/@target@-@BASECC@-$(CONFIGNAME)/gap.dll bin
 	cp /bin/cygncurses-10.dll /bin/cygncursesw-10.dll \
 	   /bin/cygpanel-10.dll /bin/cygwin1.dll \
 	   /bin/libW11.dll /usr/bin/rxvt.exe /usr/bin/regtool.exe \
@@ -307,8 +326,8 @@ cygwin:	extern
 
 winbinp:
 	( tar cfz ../winbin.tgz bin/*.dll bin/*.exe \
-          bin/@target@-@BASECC@/$(BUILD_MODE)-bit/gac \
-          bin/@target@-@BASECC@/$(BUILD_MODE)-bit/config.h \
+          bin/@target@-@BASECC@-$(CONFIGNAME)/gac \
+          bin/@target@-@BASECC@-$(CONFIGNAME)/config.h \
           terminfo )
 
 packages:

benchmark/README

@@ -16,7 +16,9 @@ As a place for these tests I have created a folder ``benchmark'' in the main
 GAP directory under CVS. Tests can be put in subfolders (which should be
 self-contained, but can contain arbitrary content). The tests in the
 subfolders are run by running GAP (from the subfolder) on a file
-test<n>
+
+test<n>.g
+
 (<n> being the number of the test) in the same folder. This file should
 contain all necessary `Read' statements and loading of packages etc. It can
 produce arbitrary screen output, which will be parsed only for the following

benchmark/grpconst/test3.g

@@ -10,7 +10,7 @@ has_errors:=false;
 
 starttime:=Runtime();
 
-for i in [256..511] do
+for i in [257..511] do
     Print("Constructing and testing all groups of order ", i, "\n");
     ConstructAndTestAllGroups( i );
 od;

benchmark/primgrp/test1.g

@@ -10,7 +10,7 @@ has_errors := false;
 Read("testprim.g");
 starttime:=Runtime();
 
-for s in [1..50] do
+for s in [1..30] do
     Print("Testing ", NrPrimitiveGroups(s), " primitive groups of degree ", s, "\n");
     TestAllPrimitiveGroups( s );
 od;

benchmark/primgrp/test2.g

@@ -10,7 +10,7 @@ has_errors := false;
 Read("testprim.g");
 starttime:=Runtime();
 
-for s in [51..200] do
+for s in [31..35] do
     Print("Testing ", NrPrimitiveGroups(s), " primitive groups of degree ", s, "\n");
     TestAllPrimitiveGroups( s );
 od;

benchmark/primgrp/test3.g

@@ -10,7 +10,7 @@ has_errors := false;
 Read("testprim.g");
 starttime:=Runtime();
 
-for s in [201..500] do
+for s in [36..37] do
     Print("Testing ", NrPrimitiveGroups(s), " primitive groups of degree ", s, "\n");
     TestAllPrimitiveGroups( s );
 od;

benchmark/smallgrp/test3.g

@@ -8,7 +8,7 @@ has_errors := false;
 Read("testgrps.g");
 starttime:=Runtime();
 
-for s in [257..513] do
+for s in [257..511] do
     Print("Testing groups of order ", s, " \n");
     TestAllGroups( s );
 od;

benchmark/transclosure/test1.g

@@ -8,7 +8,7 @@ LoadPackage("FR");
 
 starttime:=Runtime();
 
-for i in [1..7] do
+for i in [1..6] do
   Print("Test ", i, "\n");
   n:=GrigorchukMachine^i;
   r:=BinaryRelationOnPointsNC(n!.transitions);

benchmark/transclosure/test2.g

@@ -8,7 +8,7 @@ LoadPackage("FR");
 
 starttime:=Runtime();
 
-i:=8;
+i:=7;
 
   Print("Test ", i, "\n");
   n:=GrigorchukMachine^i;

benchmark/transclosure/test3.g

@@ -8,7 +8,7 @@ LoadPackage("FR");
 
 starttime:=Runtime();
 
-i:=9;
+i:=8;
 
   Print("Test ", i, "\n");
   n:=GrigorchukMachine^i;

benchmark/transgrp/pnormea.g

@@ -10,8 +10,14 @@ ApproximationNormalizerClasses:=function(u,approx)
   local bas, prm, hashfun, e, cs, pt, classes, p, nosplit, short, better, newclasses, newnosplit, dict, spl, ej, basx, cji, spll, i, j, x, y;
 
   bas:=Immutable(Set(BaseStabChain(StabChainMutable(u))));
-  prm:=Maximum(bas);
-  prm:=Immutable(Primes{[prm+1..prm+Length(bas)]});
+  e:=Maximum(bas)+1;
+  prm:=[];
+  while Length(prm)<Length(bas) do
+    e:=NextPrimeInt(e);
+    Add(prm,e);
+    e:=e*2+1;
+  od;
+  MakeImmutable(prm);
   hashfun:=tup->tup*prm;
   e:=Subgroup(Parent(u),GeneratorsOfGroup(u));
   SetSize(e,Size(u));

bin/usemem.bat

@@ -1,4 +1,4 @@
 echo "Setting MaxMem registry value"
-regtool -i set "/HKLM/Software/Cygnus Solutions/Cygwin/heap_chunk_in_mb" 1024
+regtool -i set "/HKCU/Software/Cygwin/heap_chunk_in_mb" 1024
 echo "Registry values for Cygwin are:"
-regtool -v list "/HKLM/Software/Cygnus Solutions/Cygwin"
+regtool -v list "/HKCU/Software/Cygwin"

cnf/Makefile

@@ -23,14 +23,14 @@ range		rational	read		records		saveload\
 scanner		sctable		set		stats		streams	\
 string		sysfiles	system		tietze		vars	\
 vecgf2		vec8bit         vector		vecffe		weakptr	\
-iostream	macfloat
+iostream	macfloat	intfuncs
 
 
 default: configure.out ../configure Makegap.in
 
 configure.out: configure.in aclocal.m4 config.hin
 	autoconf
-	sed -e 's%^srcdir=$$%srcdir=../../../src%' -e 's%ac_dir_suffix=/.*$$%ac_dir_suffix=%' < configure > configure.out
+	sed -e 's%^srcdir=$$%srcdir=../../src%' -e 's%ac_dir_suffix=/.*$$%ac_dir_suffix=%' < configure > configure.out
 	chmod 755 configure.out
 	rm configure
 
@@ -54,15 +54,15 @@ Makegap.in: Makegap.top Makefile Makegap.bottom
 	@echo >> Makegap.in
 	@echo '# compile and link gap.dll on cygwin' >> Makegap.in
 	@echo 'gapdll: $$(OBJECTS) $$(ITANIUMOBJ) $$(EXTOBJS) $$(GMP_LIBS)' >> Makegap.in
-	@echo '	$$(CC) -c -o gap.o ../../../src/gap.c -I. -I../../..  -DCONFIG_H -DCOMPILECYGWINDLL' >> Makegap.in
+	@echo '	$$(CC) -c -o gap.o ../../src/gap.c -I. -I../..  -DCONFIG_H -DCOMPILECYGWINDLL' >> Makegap.in
 	@echo '	$$(CC) $$(LDFLAGS) -o gap.dll -shared $$(OBJECTS) $$(ITANIUMOBJ) -lm $$(MPILIBS) $$(EXTOBJS) $$(GMP_LIBS) $$(CONFLIBS)' >> Makegap.in
-	@echo '	$$(CC) $$(LDFLAGS) -o gapw95 ../../../src/gapw95.c -I. -I../../.. -DCONFIG_H -DCOMPILECYGWINDLL gap.dll' >> Makegap.in
+	@echo '	$$(CC) $$(LDFLAGS) -o gapw95 ../../src/gapw95.c -I. -I../.. -DCONFIG_H -DCOMPILECYGWINDLL gap.dll' >> Makegap.in
 	@echo >> Makegap.in
 	@echo '# dependencies are automatically generated' >> Makegap.in
 	@(for i in `eval 'echo $(SOURCE)'`; do \
 	    $(CC) -MM -MG -I .. -DUSE_PRECOMPILED ../src/$$i.c; \
-	    echo '	$$(CC) -I. -I../../.. -DCONFIG_H $$(GMP_CFLAGS) $$(CFLAGS)' -o $$i.o -c ../src/$$i.c; \
+	    echo '	$$(CC) -I. -I../.. -DCONFIG_H $$(GMP_CFLAGS) $$(CFLAGS)' -o $$i.o -c ../src/$$i.c; \
 	    echo ; \
 	done \
-	) | sed -e 's:../src:@srcdir@:g' | sed -e 's:extern:../../extern:g' | sed -e 's#\.o: #.o: ../../../Makefile #g' >> Makegap.in
+	) | sed -e 's:../src:@srcdir@:g' | sed -e 's:extern:../../extern:g' | sed -e 's#\.o: #.o: ../../Makefile #g' >> Makegap.in
 	@cat Makegap.bottom >> Makegap.in

cnf/Makegap.bottom

@@ -7,5 +7,5 @@ gapmpi.o: @srcdir@/system.h @srcdir@/gasman.h @srcdir@/objects.h \
           @srcdir@/records.h @srcdir@/precord.h @srcdir@/lists.h \
           @srcdir@/plist.h @srcdir@/sysfiles.h @srcdir@/code.h \
           @srcdir@/vars.h @srcdir@/stats.h @srcdir@/gapmpi.h 
-	$(CC) -I. -I$(MPIINCLUDEDIR) -DCONFIG_H $(CFLAGS) -o gapmpi.o -c @srcdir@/gapmpi.c
+	$(CC) -I. $(MPI_CFLAGS) -DCONFIG_H $(CFLAGS) -o gapmpi.o -c @srcdir@/gapmpi.c