Index: gap-4r10p2/Makefile.rules
===================================================================
--- gap-4r10p2.orig/Makefile.rules
+++ gap-4r10p2/Makefile.rules
@@ -476,16 +476,16 @@ install: install-libgap install-headers
 # 	$(QUIET_INSTALL)$(INSTALL) gap $(DESTDIR)$(bindir)
 # 	$(QUIET_INSTALL)$(INSTALL) gac $(DESTDIR)$(bindir)
 # 
-# install-headers:
-# 	$(QUIET_INSTALL)$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap
-# 	$(QUIET_INSTALL)$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/hpc
-# 	$(QUIET_INSTALL)$(INSTALL) -m 0644 $(srcdir)/src/*.h $(DESTDIR)$(includedir)/gap
-# 	$(QUIET_INSTALL)$(INSTALL) -m 0644 $(srcdir)/src/hpc/*.h $(DESTDIR)$(includedir)/gap/hpc
-# 	# TODO: take care of config.h
-# 
-# install-libgap: libgap.la
-# 	$(QUIET_INSTALL)$(INSTALL) -d -m 0755 $(DESTDIR)$(libdir)
-# 	$(QUIET_INSTALL)$(LTINSTALL) libgap.la $(DESTDIR)$(libdir)
+install-headers:
+	$(QUIET_INSTALL)$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap
+	$(QUIET_INSTALL)$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/hpc
+	$(QUIET_INSTALL)$(INSTALL) -m 0644 $(srcdir)/src/*.h $(DESTDIR)$(includedir)/gap
+	$(QUIET_INSTALL)$(INSTALL) -m 0644 $(srcdir)/src/hpc/*.h $(DESTDIR)$(includedir)/gap/hpc
+	# TODO: take care of config.h
+
+install-libgap: libgap.la
+	$(QUIET_INSTALL)$(INSTALL) -d -m 0755 $(DESTDIR)$(libdir)
+	$(QUIET_INSTALL)$(LTINSTALL) libgap.la $(DESTDIR)$(libdir)
 
 
 .PHONY: install install-libgap
@@ -669,12 +669,12 @@ sysinfo.gap: config.status $(srcdir)/Mak
 	@echo "GAP_KERNEL_MAJOR_VERSION=$(GAP_KERNEL_MAJOR_VERSION)" >> $@
 	@echo "GAP_KERNEL_MINOR_VERSION=$(GAP_KERNEL_MINOR_VERSION)" >> $@
 	@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/include/gap -DHAVE_CONFIG_H\"" >> $@
 	@echo "GAP_LDFLAGS=\"$(GAP_LDFLAGS)\"" >> $@
 	@echo "GAP_LIBS=\"$(GAP_LIBS)\"" >> $@
 	@echo "" >> $@
@@ -720,7 +720,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)
 
 ########################################################################
