Index: gap-4r9p3/Makefile.rules
===================================================================
--- gap-4r9p3.orig/Makefile.rules
+++ gap-4r9p3/Makefile.rules
@@ -660,12 +660,12 @@ sysinfo.gap: config.status $(srcdir)/Mak
 	@echo "GAParch=$(GAPARCH)" >> $@
 	@echo "GAP_ABI=$(ABI)" >> $@
 	@echo "" >> $@
-	@echo "GAP_BIN_DIR=\"$(abs_builddir)\"" >> $@
-	@echo "GAP_LIB_DIR=\"$(abs_srcdir)\"" >> $@
+	@echo "GAP_BIN_DIR=\"/usr/lib/gap\"" >> $@
+	@echo "GAP_LIB_DIR=\"/usr/lib/gap\"" >> $@
 	@echo "" >> $@
 	@echo "GAP_CC=\"$(CC)\"" >> $@
 	@echo "GAP_CFLAGS=\"$(GAP_CFLAGS)\"" >> $@
-	@echo "GAP_CPPFLAGS=\"$(GAP_PKG_CPPFLAGS)\"" >> $@
+	@echo "GAP_CPPFLAGS=\"-I/usr/lib/gap -DHAVE_CONFIG_H\"" >> $@
 	@echo "GAP_LDFLAGS=\"$(GAP_LDFLAGS)\"" >> $@
 	@echo "GAP_LIBS=\"$(GAP_LIBS)\"" >> $@
 	@echo "" >> $@
@@ -696,7 +696,7 @@ endif
 ########################################################################
 
 GAPARGS=
-TESTGAP = $(abs_builddir)/bin/gap.sh --quitonbreak -b -m 100m -o 1g -q -x 80 -r -A $(GAPARGS)
+TESTGAP = $(abs_builddir)/bin/gap.sh --quitonbreak -b -m 100m -o 1g -q -x 80 -r $(GAPARGS)
 TESTGAPauto = $(abs_builddir)/bin/gap.sh --quitonbreak -b -m 100m -o 1g -q -x 80 -r $(GAPARGS)
 
 ########################################################################
