--- ./lib/Makefile_orig	2026-05-04 22:17:30.504695885 -0400
+++ ./lib/Makefile	2026-05-04 22:18:15.298381270 -0400
@@ -164,6 +164,7 @@
 endif
 	$(RM) $(CLEAN) core *.o *.a
 	$(RM) *.$(SHARED_EXT) *.$(SHARED_EXT_MAJOR) *.$(SHARED_EXT_VER)
+	$(RM) -r tmp*
 	@echo Cleaning library completed
 
 #-----------------------------------------------------------------------------
--- ./programs/Makefile_orig	2026-05-04 22:24:53.401667132 -0400
+++ ./programs/Makefile	2026-05-04 22:26:55.881680061 -0400
@@ -31,8 +31,8 @@
 SED ?= sed
 
 # Version numbers
-LIBDIR   := ../lib
-LIBVER_SRC := $(LIBDIR)/lz4.h
+LIBLZ4DIR   := ../lib
+LIBVER_SRC := $(LIBLZ4DIR)/lz4.h
 LIBVER_MAJOR_SCRIPT:=`$(SED) -n '/define[[:blank:]][[:blank:]]*LZ4_VERSION_MAJOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < $(LIBVER_SRC)`
 LIBVER_MINOR_SCRIPT:=`$(SED) -n '/define[[:blank:]][[:blank:]]*LZ4_VERSION_MINOR/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < $(LIBVER_SRC)`
 LIBVER_PATCH_SCRIPT:=`$(SED) -n '/define[[:blank:]][[:blank:]]*LZ4_VERSION_RELEASE/s/.*[[:blank:]]\([0-9][0-9]*\).*/\1/p' < $(LIBVER_SRC)`
@@ -42,7 +42,7 @@
 LIBVER_PATCH := $(shell echo $(LIBVER_PATCH_SCRIPT))
 LIBVER   := $(shell echo $(LIBVER_SCRIPT))
 
-LIBFILES  = $(wildcard $(LIBDIR)/*.c)
+LIBFILES  = $(wildcard $(LIBLZ4DIR)/*.c)
 SRCFILES  = $(sort $(LIBFILES) $(wildcard *.c))
 OBJFILES  = $(SRCFILES:.c=.o)
 
@@ -51,7 +51,7 @@
             -Wpointer-arith -Wstrict-aliasing=1
 USERCFLAGS:= -O3 $(CFLAGS) # -O3 can be overruled by user-provided -Ox level
 CFLAGS    = $(DEBUGFLAGS) $(USERCFLAGS)
-CPPFLAGS += -I$(LIBDIR) -DXXH_NAMESPACE=LZ4_
+CPPFLAGS += -I$(LIBLZ4DIR) -DXXH_NAMESPACE=LZ4_
 
 include ../Makefile.inc
 
@@ -132,8 +132,8 @@
 
 CLEAN += lz4-wlib
 lz4-wlib: LIBFILES =
-lz4-wlib: SRCFILES+= $(LIBDIR)/xxhash.c  # benchmark unit needs XXH64()
-lz4-wlib: LDFLAGS += -L $(LIBDIR)
+lz4-wlib: SRCFILES+= $(LIBLZ4DIR)/xxhash.c  # benchmark unit needs XXH64()
+lz4-wlib: LDFLAGS += -L $(LIBLZ4DIR)
 lz4-wlib: LDLIBS   = -llz4
 lz4-wlib: liblz4 $(OBJFILES)
 	@echo WARNING: $@ must link to an extended variant of the dynamic library which also exposes unstable symbols
@@ -141,7 +141,7 @@
 
 .PHONY:liblz4
 liblz4:
-	CPPFLAGS="-DLZ4F_PUBLISH_STATIC_FUNCTIONS -DLZ4_PUBLISH_STATIC_FUNCTIONS" $(MAKE) -C $(LIBDIR) liblz4
+	CPPFLAGS="-DLZ4F_PUBLISH_STATIC_FUNCTIONS -DLZ4_PUBLISH_STATIC_FUNCTIONS" $(MAKE) -C $(LIBLZ4DIR) liblz4
 
 CLEAN += lz4c
 lz4c: lz4
@@ -179,8 +179,9 @@
 ifeq ($(WINBASED),yes)
 	$(RM) *.rc
 endif
-	$(MAKE) -C $(LIBDIR) $@ > $(VOID)
-	$(RM) $(CLEAN) *.o tmp* *.test core
+	$(MAKE) -C $(LIBLZ4DIR) $@ > $(VOID)
+	$(RM) $(CLEAN) *.o *.test core
+	$(RM) -r tmp*
 	@echo Cleaning completed
 
 
--- ./tests/Makefile_orig	2026-05-04 22:27:10.606603950 -0400
+++ ./tests/Makefile	2026-05-04 22:28:08.537308923 -0400
@@ -145,8 +145,8 @@
 clean:
 	@$(MAKE) -C $(LIBDIR) $@ > $(VOID)
 	@$(MAKE) -C $(PRGDIR) $@ > $(VOID)
-	@$(RM) $(CLEAN) core *.o *.test tmp*
-	@$(RM) -r $(TESTDIR)
+	@$(RM) $(CLEAN) core *.o *.test
+	@$(RM) -r $(TESTDIR) tmp*
 	@echo Cleaning completed
 
 .PHONY: versionsTest