From 0b5bf02f24354bc2388a02df63a3fe5794fb92fd Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Wed, 5 Apr 2023 23:06:36 +0200
Subject: [PATCH] Stop installing headers into includedir/gap/src

No currently distributed package needs this anymore
---
 Makefile.rules     | 9 ---------
 README.buildsys.md | 2 --
 configure.ac       | 7 -------
 dev/ci.sh          | 1 -
 4 files changed, 19 deletions(-)

diff --git a/Makefile.rules b/Makefile.rules
index 7d95cebfe6..097906adb7 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -648,15 +648,6 @@ install-headers: $(FFDATA_H) build/version.h
 	$(INSTALL) -m 0644 $(builddir)/build/version.h $(DESTDIR)$(includedir)/gap
 	$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/hpc
 	$(INSTALL) -m 0644 $(srcdir)/src/hpc/*.h $(DESTDIR)$(includedir)/gap/hpc
-	# For compatibility with GAP packages still using `#include "src/compiled.h"`
-	# and similar, also install copies of all headers into a `src` directory
-	# TODO: remove this once no distributed packages needs it anymore
-	$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/src
-	$(INSTALL) -m 0644 $(srcdir)/src/*.h $(DESTDIR)$(includedir)/gap/src
-	$(INSTALL) -m 0644 $(FFDATA_H) $(DESTDIR)$(includedir)/gap/src
-	$(INSTALL) -m 0644 $(builddir)/build/version.h $(DESTDIR)$(includedir)/gap/src
-	$(INSTALL) -d -m 0755 $(DESTDIR)$(includedir)/gap/src/hpc
-	$(INSTALL) -m 0644 $(srcdir)/src/hpc/*.h $(DESTDIR)$(includedir)/gap/src/hpc
 
 install-libgap: libgap.la libgap.pc
 	$(INSTALL) -d -m 0755 $(DESTDIR)$(libdir)
diff --git a/README.buildsys.md b/README.buildsys.md
index eb70372ca2..7fe9dc2c45 100644
--- a/README.buildsys.md
+++ b/README.buildsys.md
@@ -125,7 +125,6 @@ far off.
 Compatibility mode does the following things:
 
 * create a `bin/gap.sh` shell script invoking `gap`
-* for out-of-tree builds, it creates a `${builddir}/src/compiled.h` file
 * ...
 
 For now, using compatibility mode is required if one wants to build the
@@ -225,7 +224,6 @@ One final remark: some of the generated files differ for HPC-GAP. If you want
 to cross compile HPC-GAP, you need to generate them with HPC-GAP, and place
 them into `src/hpc` instead of `src`, like in this example:
 
-
     ./configure --enable-hpcgap
     make
     cp build/c_*.c src/hpc/
diff --git a/configure.ac b/configure.ac
index 38765c7b93..82b41195ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -956,13 +956,6 @@ AS_IF([test "x$enable_compat_mode" = xyes],
         ],
         [
             AC_MSG_NOTICE([out-of-tree build])
-            # FIXME: the following config command works if invoked
-            # explicitly, but for some reason is not added to the list
-            # of automatic command
-            AC_CONFIG_COMMANDS([src/compiled.h],
-                [
-                echo "#include \"$ac_abs_top_srcdir/src/compiled.h\"" > src/compiled.h
-                ])
         ])
     ])
 
diff --git a/dev/ci.sh b/dev/ci.sh
index 2c26b42e53..619f06171b 100755
--- a/dev/ci.sh
+++ b/dev/ci.sh
@@ -234,7 +234,6 @@ GAPInput
     test -f $GAPPREFIX/bin/gac
     test -f $GAPPREFIX/include/gap/gap_all.h
     test -f $GAPPREFIX/include/gap/version.h
-    test -f $GAPPREFIX/include/gap/src/compiled.h # for backwards compatibility
     test -f $GAPPREFIX/lib/gap/sysinfo.gap
     test -f $GAPPREFIX/lib/pkgconfig/libgap.pc
     test -f $GAPPREFIX/share/gap/doc/ref/chap0_mj.html