merge with 3.8.3b

1 files changed, 12 insertions, 0 deletions

diff --git a/src/cp.c b/src/cp.c
index f0a5ce529..c1ae72c84 100644
--- a/src/cp.c
+++ b/src/cp.c
@@ -20,6 +20,18 @@
 #ifdef _AIX
  #pragma alloca
 #endif
+
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I$srcdir will use ./config.h rather than $srcdir/config.h
+   (which it would do because it found this file in $srcdir).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <stdio.h>
 #include <getopt.h>
 #include "cp.h"