diff --git a/srcpkgs/golly/template b/srcpkgs/golly/template
index 0a6f88d03af..614c13b3be5 100644
--- a/srcpkgs/golly/template
+++ b/srcpkgs/golly/template
@@ -18,14 +18,16 @@ homepage="http://golly.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-src.tar.gz"
 checksum=45a8595c9f7064de029f05d339e3fca3776b5a0c36fef95712e697f154d82ae5
 
+CXXFLAGS="-I../gollybase"
+
 post_extract() {
 	# POSIX name clash
-	sed -i 's/PAGESIZE/GOLLYPAGESIZE/' gui-wx/*.cpp
+	vsed -i 's/PAGESIZE/GOLLYPAGESIZE/' $(grep -rlw PAGESIZE gui-wx/*.cpp)
 }
 
 pre_configure() {
 	if [ "$CROSS_BUILD" ]; then
-		sed -i "s,\(PYTHON_INCLUDE\) =.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python3.9,g" makefile-gtk
+		vsed -i "s,\(PYTHON_INCLUDE\) =.*,\1=-I${XBPS_CROSS_BASE}/usr/include/python3.9,g" makefile-gtk
 	fi
 }