---
 scripts/Makefile.frag |    4 ++--
 scripts/phpize.in     |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: php-8.0.0/scripts/Makefile.frag
===================================================================
--- php-8.0.0.orig/scripts/Makefile.frag	2020-11-24 18:04:03.000000000 +0100
+++ php-8.0.0/scripts/Makefile.frag	2021-01-07 10:13:16.914490379 +0100
@@ -2,8 +2,8 @@
 # Build environment install
 #
 
-phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/build
+phpincludedir = $(includedir)/php8
+phpbuilddir = $(datadir)/build
 
 BUILD_FILES = \
 	scripts/phpize.m4 \
Index: php-8.0.0/scripts/phpize.in
===================================================================
--- php-8.0.0.orig/scripts/phpize.in	2020-11-24 18:04:03.000000000 +0100
+++ php-8.0.0/scripts/phpize.in	2021-01-07 10:13:16.914490379 +0100
@@ -4,8 +4,8 @@
 prefix='@prefix@'
 datarootdir='@datarootdir@'
 exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
-includedir="`eval echo @includedir@`/php"
+phpdir="`eval echo @datadir@`/build"
+includedir="`eval echo @includedir@`/php8"
 builddir="`pwd`"
 SED="@SED@"