From 9071e95080d46bcb688050e49ff6dd27df025541 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Mon, 14 Jul 2014 09:46:17 -0600
Subject: [PATCH] Move mksiglist.h and mksigname.h to lib/util where they
 belong.

---
 MANIFEST                                 | 26 ++++++++++++------------
 lib/util/Makefile.in                     | 10 ++++-----
 lib/util/mksiglist.c                     |  2 +-
 {include/compat => lib/util}/mksiglist.h |  0
 lib/util/mksigname.c                     |  2 +-
 {include/compat => lib/util}/mksigname.h |  0
 6 files changed, 20 insertions(+), 20 deletions(-)
 rename {include/compat => lib/util}/mksiglist.h (100%)
 rename {include/compat => lib/util}/mksigname.h (100%)

diff --git a/MANIFEST b/MANIFEST
index 90709633b..3807f2c09 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -50,19 +50,17 @@ doc/visudo.cat
 doc/visudo.man.in
 doc/visudo.mdoc.in
 include/Makefile.in
-include/compat/charclass.h/
-include/compat/endian.h/
-include/compat/fnmatch.h/
-include/compat/getaddrinfo.h/
-include/compat/getopt.h/
-include/compat/glob.h/
-include/compat/mksiglist.h/
-include/compat/mksigname.h/
-include/compat/nss_dbdefs.h/
-include/compat/sha2.h/
-include/compat/stdbool.h/
-include/compat/timespec.h/
-include/compat/utime.h/
+include/compat/charclass.h
+include/compat/endian.h
+include/compat/fnmatch.h
+include/compat/getaddrinfo.h
+include/compat/getopt.h
+include/compat/glob.h
+include/compat/nss_dbdefs.h
+include/compat/sha2.h
+include/compat/stdbool.h
+include/compat/timespec.h
+include/compat/utime.h
 include/fatal.h
 include/gettext.h
 include/missing.h
@@ -105,7 +103,9 @@ lib/util/locking.c
 lib/util/memrchr.c
 lib/util/memset_s.c
 lib/util/mksiglist.c
+lib/util/mksiglist.h
 lib/util/mksigname.c
+lib/util/mksigname.h
 lib/util/mktemp.c
 lib/util/parseln.c
 lib/util/progname.c
diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in
index b2e0ad0a5..87ee735dd 100644
--- a/lib/util/Makefile.in
+++ b/lib/util/Makefile.in
@@ -53,7 +53,7 @@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c
 INSTALL_OWNER = -o $(install_uid) -g $(install_gid)
 
 # C preprocessor flags
-CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(top_srcdir) @CPPFLAGS@
+CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
 
 # Usually -O and/or -g
 CFLAGS = @CFLAGS@
@@ -383,11 +383,11 @@ memrchr.lo: $(srcdir)/memrchr.c $(incdir)/missing.h $(top_builddir)/config.h
 	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/memrchr.c
 memset_s.lo: $(srcdir)/memset_s.c $(incdir)/missing.h $(top_builddir)/config.h
 	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/memset_s.c
-mksiglist.lo: $(srcdir)/mksiglist.c $(incdir)/compat/mksiglist.h \
-              $(incdir)/missing.h $(top_builddir)/config.h
+mksiglist.lo: $(srcdir)/mksiglist.c $(incdir)/missing.h $(srcdir)/mksiglist.h \
+              $(top_builddir)/config.h
 	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksiglist.c
-mksigname.lo: $(srcdir)/mksigname.c $(incdir)/compat/mksigname.h \
-              $(incdir)/missing.h $(top_builddir)/config.h
+mksigname.lo: $(srcdir)/mksigname.c $(incdir)/missing.h $(srcdir)/mksigname.h \
+              $(top_builddir)/config.h
 	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mksigname.c
 mktemp.lo: $(srcdir)/mktemp.c $(incdir)/missing.h $(top_builddir)/config.h
 	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/mktemp.c
diff --git a/lib/util/mksiglist.c b/lib/util/mksiglist.c
index 56729a8f3..56df089b9 100644
--- a/lib/util/mksiglist.c
+++ b/lib/util/mksiglist.c
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
     static char *sudo_sys_siglist[NSIG];
     int i;
 
-#include "compat/mksiglist.h"
+#include "mksiglist.h"
 
     printf("#include <config.h>\n");
     printf("#include <signal.h>\n");
diff --git a/include/compat/mksiglist.h b/lib/util/mksiglist.h
similarity index 100%
rename from include/compat/mksiglist.h
rename to lib/util/mksiglist.h
diff --git a/lib/util/mksigname.c b/lib/util/mksigname.c
index 10b632464..13d8e0022 100644
--- a/lib/util/mksigname.c
+++ b/lib/util/mksigname.c
@@ -40,7 +40,7 @@ main(int argc, char *argv[])
     static char *sudo_sys_signame[NSIG];
     int i;
 
-#include "compat/mksigname.h"
+#include "mksigname.h"
 
     printf("#include <config.h>\n");
     printf("#include <signal.h>\n");
diff --git a/include/compat/mksigname.h b/lib/util/mksigname.h
similarity index 100%
rename from include/compat/mksigname.h
rename to lib/util/mksigname.h
-- 
2.40.0