diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-12-27 14:53:18 +0100 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-12-27 16:22:11 +0100 |
| commit | a972bc51b3aa3e0613f836fb2505b73e6f25fcb2 (patch) | |
| tree | 427fa5b7fffc3feb460f7223b479c360fedcb34d /patches/at-3.1.12 | |
| parent | 83750e11d72f84a31f632a65836ac68a9ac3ab85 (diff) | |
| download | ptxdist-a972bc51b3aa3e0613f836fb2505b73e6f25fcb2.tar.gz ptxdist-a972bc51b3aa3e0613f836fb2505b73e6f25fcb2.tar.xz | |
[at] fix patch to apply
In commit 51824c0c21e93c37290d8353f306b54aeda95eda, patch 0004 has been
removed. This is okay, but this patch (0005) doesn't apply anymore. This
commit fixes this.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'patches/at-3.1.12')
| -rw-r--r-- | patches/at-3.1.12/0005-Makefile.in-replace-IROOT-by-DESTDIR.patch | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/patches/at-3.1.12/0005-Makefile.in-replace-IROOT-by-DESTDIR.patch b/patches/at-3.1.12/0005-Makefile.in-replace-IROOT-by-DESTDIR.patch index fc96d834b..6a295e37c 100644 --- a/patches/at-3.1.12/0005-Makefile.in-replace-IROOT-by-DESTDIR.patch +++ b/patches/at-3.1.12/0005-Makefile.in-replace-IROOT-by-DESTDIR.patch @@ -8,13 +8,13 @@ variable. For backwards compatibilty IROOT overwrites the DESTDIR. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- - Makefile.in | 64 +++++++++++++++++++++++++++++++--------------------------- - 1 files changed, 34 insertions(+), 30 deletions(-) + Makefile.in | 64 +++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 34 insertions(+), 30 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index c4fbd18..c5b2ac4 100644 ---- a/Makefile.in -+++ b/Makefile.in +Index: at-3.1.12/Makefile.in +=================================================================== +--- at-3.1.12.orig/Makefile.in ++++ at-3.1.12/Makefile.in @@ -16,6 +16,10 @@ docdir = $(prefix)/doc atdocdir = $(docdir)/at etcdir = @ETCDIR@ @@ -41,14 +41,14 @@ index c4fbd18..c5b2ac4 100644 - chmod 600 $(IROOT)$(LFILE) - chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE) - test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/ -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir) +- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(IROOT)$(bindir) - $(LN_S) -f at $(IROOT)$(bindir)/atq - $(LN_S) -f at $(IROOT)$(bindir)/atrm - $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir) - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir) - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir) -- $(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir) +- $(INSTALL) -g root -o root -m 755 -s atd $(IROOT)$(sbindir) - $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir) - $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/ - cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 @@ -64,14 +64,14 @@ index c4fbd18..c5b2ac4 100644 + chmod 600 $(DESTDIR)$(LFILE) + chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE) + test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/ -+ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(DESTDIR)$(bindir) ++ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(DESTDIR)$(bindir) + $(LN_S) -f at $(DESTDIR)$(bindir)/atq + $(LN_S) -f at $(DESTDIR)$(bindir)/atrm + $(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir) + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir) + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir) + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir) -+ $(INSTALL) -g root -o root -m 755 atd $(DESTDIR)$(sbindir) ++ $(INSTALL) -g root -o root -m 755 -s atd $(DESTDIR)$(sbindir) + $(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir) + $(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/ + cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 @@ -87,7 +87,7 @@ index c4fbd18..c5b2ac4 100644 - $(IROOT)$(mandir)/cat1/atq.1* - rm -f $(IROOT)$(mandir)/cat1/atd.8* + $(INSTALL) -g root -o root -m 644 at_allow.5 $(DESTDIR)$(man5dir)/ -+ cd $(DESTDIR)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 ++ cd $(DESTDIR)$(man5dir) && $(LN_S) -f at_allow.5 at_deny.5 + $(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir) + rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \ + $(DESTDIR)$(mandir)/cat1/atq.1* @@ -95,6 +95,3 @@ index c4fbd18..c5b2ac4 100644 dist: checkin $(DIST) $(LIST) Filelist.asc (cd ..; tar cf - `for a in $(DIST) $(LIST); do echo at-$(VERSION)/$$a; done` |\ --- -1.6.5.3 - |