commit untracked files ... confusing

[debian/amanda] / gnulib / regenerate / no-error.patch.BACKUP.7723.patch

diff --git a/gnulib/regenerate/no-error.patch.BACKUP.7723.patch b/gnulib/regenerate/no-error.patch.BACKUP.7723.patch
new file mode 100644 (file)
index 0000000..6dcbd67
--- /dev/null
+++ b/gnulib/regenerate/no-error.patch.BACKUP.7723.patch
@@ -0,0 +1,18 @@
+Index: gnulib/Makefile.am
+===================================================================
+--- gnulib/Makefile.am (revision 5691)
++++ gnulib/Makefile.am (working copy)
+@@ -26,6 +26,9 @@
+ MAINTAINERCLEANFILES =
+ 
+ AM_CPPFLAGS =
++if GCC_COMPILER
+<<<<<<< HEAD:gnulib/regenerate/no-error.patch
++  AM_CFLAGS += -Wno-error
+=======
++  AM_CFLAGS = -Wno-error -Wno-sign-compare
+>>>>>>> upstream:gnulib/regenerate/no-error.patch
++endif
+ 
+ noinst_LTLIBRARIES += libgnu.la
+