3 files changed, 41 insertions, 9 deletions
diff --git a/lib/concat-filename.c b/lib/concat-filename.c
index 26c52f9794..94532d0741 100644
--- a/lib/concat-filename.c
+++ b/lib/concat-filename.c
@@ -1,5 +1,5 @@
-/* Construct a full pathname from a directory and a filename.
-   Copyright (C) 2001-2004, 2006-2007 Free Software Foundation, Inc.
+/* Construct a full filename from a directory and a relative filename.
+   Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
@@ -19,10 +19,11 @@
 #include <config.h>
 
 /* Specification.  */
-#include "filename.h"
+#include "concat-filename.h"
 
 #include <string.h>
 
+#include "filename.h"
 #include "xalloc.h"
 
 /* Concatenate a directory filename, a relative filename and an optional
diff --git a/lib/concat-filename.h b/lib/concat-filename.h
new file mode 100644
index 0000000000..d7dafb0ec2
--- /dev/null
+++ b/lib/concat-filename.h
@@ -0,0 +1,35 @@
+/* Construct a full filename from a directory and a relative filename.
+   Copyright (C) 2001-2004, 2007-2008 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#ifndef _CONCAT_FILENAME_H
+#define _CONCAT_FILENAME_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Concatenate a directory filename, a relative filename and an optional
+   suffix.  Return a freshly allocated filename.  */
+extern char *concatenated_filename (const char *directory,
+				    const char *filename, const char *suffix);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _CONCAT_FILENAME_H */
diff --git a/lib/filename.h b/lib/filename.h
index 3bcf66ff9a..439689e19b 100644
--- a/lib/filename.h
+++ b/lib/filename.h
@@ -1,5 +1,5 @@
-/* Pathname support.
-   Copyright (C) 2001-2004, 2007 Free Software Foundation, Inc.
+/* Basic filename support macros.
+   Copyright (C) 2001-2004, 2007-2008 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,10 +46,6 @@ extern "C" {
 # define FILE_SYSTEM_PREFIX_LEN(P) 0
 #endif
 
-/* Concatenate a directory filename, a relative filename and an optional
-   suffix.  Return a freshly allocated filename.  */
-extern char *concatenated_filename (const char *directory,
-				    const char *filename, const char *suffix);
 
 #ifdef __cplusplus
 }