From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 2 Apr 2010 13:49:21 +0000 (-0400)
Subject: Fix LIBOBJDIR vs. srcdir wrt the siglist bits
X-Git-Tag: SUDO_1_8_0~752
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7539f636b6413643ceb5344b063081c629d669c5;p=sudo

Fix LIBOBJDIR vs. srcdir wrt the siglist bits
---

diff --git a/compat/Makefile.in b/compat/Makefile.in
index 4b15c3c18..c9cc9daae 100644
--- a/compat/Makefile.in
+++ b/compat/Makefile.in
@@ -60,16 +60,16 @@ all: libreplace.la
 libreplace.la: $(LTLIBOBJS)
 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LTLIBOBJS) -no-install
 
-$(LIBOBJDIR)siglist.c: $(LIBOBJDIR)mksiglist
-	$(LIBOBJDIR)mksiglist > $@
+siglist.c: mksiglist
+	./mksiglist > $@
 
-$(LIBOBJDIR)mksiglist: $(LIBOBJDIR)mksiglist.c $(LIBOBJDIR)mksiglist.h $(incdir)/compat.h $(top_builddir)/config.h
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(LIBOBJDIR)mksiglist.c -o $@
+mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/compat.h $(top_builddir)/config.h
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@
 
-@DEV@$(LIBOBJDIR)mksiglist.h: $(LIBOBJDIR)siglist.in
-@DEV@	awk '/^    [A-Z]/ {printf("#ifdef SIG%s\n    if (my_sys_siglist[SIG%s] == NULL)\n\tmy_sys_siglist[SIG%s] = \"%s\";\n#endif\n", $1, $1, $1, substr($0, 13))}' < $(LIBOBJDIR)siglist.in > $@
+@DEV@$(srcdir)/mksiglist.h: $(srcdir)/siglist.in
+@DEV@	awk '/^    [A-Z]/ {printf("#ifdef SIG%s\n    if (my_sys_siglist[SIG%s] == NULL)\n\tmy_sys_siglist[SIG%s] = \"%s\";\n#endif\n", $1, $1, $1, substr($0, 13))}' < $(srcdir)/siglist.in > $@
 
-$(LIBOBJDIR)siglist.lo: $(LIBOBJDIR)siglist.c $(incdir)/compat.h $(top_builddir)/config.h
+$(LIBOBJDIR)siglist.lo: siglist.c $(incdir)/compat.h $(top_builddir)/config.h
 
 # Dependencies
 $(LIBOBJDIR)closefrom.lo: $(compat)/closefrom.c $(incdir)/compat.h $(top_builddir)/config.h
@@ -103,7 +103,7 @@ check:
 	@echo nothing to check
 
 clean:
-	-rm -f *.a *.o *.lo *.la stamp-* core *.core core.*
+	-rm -f mksiglist siglist.c *.a *.o *.lo *.la stamp-* core *.core core.*
 
 mostlyclean: clean