From: Bdale Garbee <bdale@gag.com>
Date: Mon, 19 Mar 2012 14:03:05 +0000 (+0100)
Subject: oops, be consistent about patch application in checked out tree
X-Git-Tag: debian/1.8.3p2-2~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=0b8efb32974033ac6e5074253c13f72720274f3b;p=debian%2Fsudo

oops, be consistent about patch application in checked out tree
---

diff --git a/common/Makefile.in b/common/Makefile.in
index 9ee10c7..a1319ef 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -35,9 +35,6 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(top_srcdir) @CPPFLAGS@
 # Usually -O and/or -g
 CFLAGS = @CFLAGS@
 
-# Linker flags
-LDFLAGS = @LDFLAGS@
-
 # OS dependent defines
 DEFS = @OSDEFS@
 
@@ -59,7 +56,7 @@ Makefile: $(srcdir)/Makefile.in
 	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $<
 
 libcommon.la: $(LTOBJS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LTOBJS) -no-install
+	$(LIBTOOL) --mode=link $(CC) -o $@ $(LTOBJS) -no-install
 
 pre-install:
 
diff --git a/compat/Makefile.in b/compat/Makefile.in
index 33f2e65..09a02b2 100644
--- a/compat/Makefile.in
+++ b/compat/Makefile.in
@@ -35,9 +35,6 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(top_srcdir) @CPPFLAGS@
 # Usually -O and/or -g
 CFLAGS = @CFLAGS@
 
-# Linker flags
-LDFLAGS = @LDFLAGS@
-
 # OS dependent defines
 DEFS = @OSDEFS@
 
@@ -65,19 +62,19 @@ Makefile: $(srcdir)/Makefile.in
 	$(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(DEFS) $<
 
 libreplace.la: $(LTLIBOBJS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LTLIBOBJS) -no-install
+	$(LIBTOOL) --mode=link $(CC) -o $@ $(LTLIBOBJS) -no-install
 
 siglist.c: mksiglist
 	./mksiglist > $@
 
 mksiglist: $(srcdir)/mksiglist.c $(srcdir)/mksiglist.h $(incdir)/missing.h $(top_builddir)/config.h
-	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) $(srcdir)/mksiglist.c -o $@
 
 fnm_test: fnm_test.o libreplace.la
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ fnm_test.o libreplace.la
+	$(LIBTOOL) --mode=link $(CC) -o $@ fnm_test.o libreplace.la
 
 globtest: globtest.o libreplace.la
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ globtest.o libreplace.la
+	$(LIBTOOL) --mode=link $(CC) -o $@ globtest.o libreplace.la
 
 @DEV@$(srcdir)/mksiglist.h: $(srcdir)/siglist.in
 @DEV@	awk 'BEGIN {print "/* public domain */\n"} /^    [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 > $@
diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 71a316d..6c3c35c 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -159,7 +159,7 @@ Makefile: $(srcdir)/Makefile.in
 	(cd $(top_builddir) && ./config.status --file plugins/sudoers/Makefile)
 
 libparsesudoers.la: $(LIBPARSESUDOERS_OBJS)
-	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LIBPARSESUDOERS_OBJS) -no-install
+	$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBPARSESUDOERS_OBJS) -no-install
 
 sudoers.la: $(SUDOERS_OBJS) $(LT_LIBS) libparsesudoers.la
 	$(LIBTOOL) @LT_STATIC@ --mode=link $(CC) $(SUDOERS_LDFLAGS) $(LTLDFLAGS) -o $@ $(SUDOERS_OBJS) libparsesudoers.la $(SUDOERS_LIBS) -module -export-symbols $(srcdir)/sudoers.sym -avoid-version -rpath $(plugindir)
diff --git a/src/Makefile.in b/src/Makefile.in
index d81a368..49ed68e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -101,7 +101,7 @@ libsudo_noexec.la: sudo_noexec.lo
 	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LTLDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
 
 sesh: sesh.o
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ sesh.o
+	$(CC) -o $@ sesh.o
 
 pre-install: