--- src/makemake.in.orig	2024-12-28 07:47:59 UTC
+++ src/makemake.in
@@ -1362,7 +1362,7 @@ if [ $XCC_GCC = true ] ; then
     case "$XCC_GCC_VERSION" in
       2.* | 3.[1-3]*) ;;
       *)
-        Z_XCFLAGS=$Z_XCFLAGS' -fwrapv'
+        Z_XCFLAGS=$Z_XCFLAGS' -fwrapv -fno-strict-overflow'
         ;;
     esac
   fi
@@ -2258,7 +2258,7 @@ echol "libdir  = ${LIBDIR}"
 echol "psdir   = ${PSDIR}"
 echol "pdfdir  = ${PDFDIR}"
 echol "libdir  = ${LIBDIR}"
-echol "lisplibdir = \$(libdir)${NEXT_}\$(TOPDIR)"
+echol "lisplibdir = \$(libdir)${NEXT_}clisp"
 test -n "$USE_GETTEXT" && echol "localedir = ${LOCALEDIR}"
 echol "elispdir = ${ELISPDIR}"
 echol "vimdir = ${VIMDIR}"