--- buildaux/Makefile.am.orig	2026-04-05 18:51:58 UTC
+++ buildaux/Makefile.am
@@ -1,15 +1,14 @@
 # SPDX-FileCopyrightText: (C) Eric S. Raymond <esr@thyrsus.com>
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-ICK_SPECIFIC_SUBDIR = ick-@PACKAGE_VERSION@
+ICK_SPECIFIC_SUBDIR = ick
 ickincludedir = $(includedir)/$(ICK_SPECIFIC_SUBDIR)
 ickdatadir = $(datadir)/$(ICK_SPECIFIC_SUBDIR)
 
 AM_CFLAGS = '-DICKINCLUDEDIR="$(ickincludedir)"' \
             '-DICKDATADIR="$(ickdatadir)"' \
             '-DICKBINDIR="$(bindir)"' '-DICKLIBDIR="$(libdir)"' \
-            -DYYDEBUG -DICK_HAVE_STDINT_H=@HAVE_STDINT_H@ \
-	    -fno-toplevel-reorder
+            -DYYDEBUG -DICK_HAVE_STDINT_H=@HAVE_STDINT_H@
 AM_CPPFLAGS = -I$(srcdir)/src
 
 bin_PROGRAMS = ick convickt
@@ -195,7 +194,7 @@ clean-local:
 
 # Clean the pit test binaries on toplevel make clean
 clean-local:
-	if [ -d pit ]; then cd pit; make clean; fi
+	if [ -d pit ]; then cd pit; $(MAKE) clean; fi
 
 
 # A subtle yet potentially common issue: ick favours the install location over
@@ -227,7 +226,7 @@ check-am: ick$(EXEEXT) verify-libick-version
 	chmod u+w $(top_srcdir)/pit
 	chmod u+w $(top_srcdir)/pit/lib
 	chmod u+w $(top_srcdir)/pit/tests
-	make -f $(top_srcdir)/pit/Makefile ICKENV="" ICK="./ick$(EXEEXT)" ICKOPTS="-b" PIT=$(top_srcdir)/pit test
+	$(MAKE) -f $(top_srcdir)/pit/Makefile ICKENV="" ICK="./ick$(EXEEXT)" ICKOPTS="-b" PIT=$(top_srcdir)/pit test
 
 # Run the fuzztest
 fuzz: ick$(EXEEXT) src/idiotism.oil $(top_srcdir)/etc/interfuzz.pl verify-libick-version
@@ -239,7 +238,7 @@ doc/ick.txt: doc/ick.texi
 # If a documentation file is needed but not available, invoke the doc
 # makefile to build it.
 doc/ick.txt: doc/ick.texi
-	cd $(top_srcdir)/doc && make ick.txt
+	cd $(top_srcdir)/doc && $(MAKE) ick.txt
 
 echo-version:
 	@echo @PACKAGE_VERSION@