]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
fix: Fix uninstall_dev failing to remove empty dir
authorRyan Keane <the.ra2.ifv@gmail.com>
Sat, 20 Dec 2025 10:30:00 +0000 (02:30 -0800)
committerMatt Caswell <matt@openssl.org>
Mon, 19 Jan 2026 11:57:45 +0000 (11:57 +0000)
Fix this error:
```
rmdir "$PREFIX/lib64/cmake/OpenSSL"
rmdir "$PREFIX/lib64"
rmdir: failed to remove '$PREFIX/lib64': Directory not empty
```
Because `rmdir $PREFIX/lib64/cmake` is missing

CLA: trivial
Signed-off-by: Ryan Keane <the.ra2.ifv@gmail.com>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
MergeDate: Mon Jan 19 11:58:05 2026
(Merged from https://github.com/openssl/openssl/pull/29472)

Configurations/unix-Makefile.tmpl

index 3d8df76989b1563547351f85edebd66f90e0dde5..155aa46955abddaa4512a179bef3ce499c17c334 100644 (file)
@@ -879,6 +879,7 @@ uninstall_dev: uninstall_runtime_libs
        done
        -$(RMDIR) "$(DESTDIR)$(PKGCONFIGDIR)"
        -$(RMDIR) "$(DESTDIR)$(CMAKECONFIGDIR)"
+       -$(RMDIR) "$(DESTDIR)$(libdir)/cmake"
        -$(RMDIR) "$(DESTDIR)$(libdir)"
 
 _install_modules_deps: install_runtime_libs build_modules