>From a58748b06ad1e46363a9f797310f58feb0b9c646 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 5 Jul 2020 21:10:11 +0200
Subject: [PATCH 5/7] filenamecat-lgpl: Trim module dependencies.

* lib/filenamecat-lgpl.c: Include basename-lgpl.h, filename.h instead of
dirname.h.
* modules/filenamecat-lgpl (Depends-on): Remove dirname-lgpl. Add
basename-lgpl, filename.
---
 ChangeLog                | 8 ++++++++
 lib/filenamecat-lgpl.c   | 3 ++-
 modules/filenamecat-lgpl | 3 ++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8e26586..3dd7a0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2020-07-05  Bruno Haible  <bruno@clisp.org>
 
+	filenamecat-lgpl: Trim module dependencies.
+	* lib/filenamecat-lgpl.c: Include basename-lgpl.h, filename.h instead of
+	dirname.h.
+	* modules/filenamecat-lgpl (Depends-on): Remove dirname-lgpl. Add
+	basename-lgpl, filename.
+
+2020-07-05  Bruno Haible  <bruno@clisp.org>
+
 	backupfile, backup-rename: Trim module dependencies.
 	* lib/backupfile.c: Include basename-lgpl.h instead of dirname.h.
 	* modules/backupfile (Depends-on): Remove dirname-lgpl. Add
diff --git a/lib/filenamecat-lgpl.c b/lib/filenamecat-lgpl.c
index d97abfa..7e77d35 100644
--- a/lib/filenamecat-lgpl.c
+++ b/lib/filenamecat-lgpl.c
@@ -25,7 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "dirname.h"
+#include "basename-lgpl.h"
+#include "filename.h"
 
 #if ! HAVE_MEMPCPY && ! defined mempcpy
 # define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N)))
diff --git a/modules/filenamecat-lgpl b/modules/filenamecat-lgpl
index a6bf60b..ffb94ab 100644
--- a/modules/filenamecat-lgpl
+++ b/modules/filenamecat-lgpl
@@ -8,7 +8,8 @@ m4/filenamecat.m4
 
 Depends-on:
 c99
-dirname-lgpl
+basename-lgpl
+filename
 malloc-posix
 
 configure.ac:
-- 
2.7.4