1 From 195d30e2e01fe2f91ed3bdaeec3982aa66b309dd Mon Sep 17 00:00:00 2001
2 From: Marc Kleine-Budde <mkl@pengutronix.de>
3 Date: Tue, 1 Dec 2009 20:57:45 +0100
4 Subject: [PATCH 5/5] Makefile.in: replace IROOT by DESTDIR
6 This patch replaces IROOT by DESTDIR, which is the autotools standard
7 variable. For backwards compatibilty IROOT overwrites the DESTDIR.
9 [Vincent: tweak the patch for the new version]
11 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
12 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
14 Makefile.in | 68 ++++++++++++++++++++++++++++++++-----------------------------
15 1 file changed, 36 insertions(+), 32 deletions(-)
17 diff --git a/Makefile.in b/Makefile.in
18 index 06544f9..1f699d9 100644
21 @@ -17,6 +17,10 @@ atdocdir = $(docdir)/at
23 systemdsystemunitdir = @systemdsystemunitdir@
29 DAEMON_USERNAME = @DAEMON_USERNAME@
30 DAEMON_GROUPNAME= @DAEMON_GROUPNAME@
31 LOADAVG_MX = @LOADAVG_MX@
32 @@ -91,41 +95,41 @@ atrun: atrun.in
33 $(CC) -c $(CFLAGS) $(DEFS) $*.c
36 - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir)
37 - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir)
38 - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir)
39 - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir)
40 - $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir)
41 - $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
42 - chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR)
43 - touch $(IROOT)$(LFILE)
44 - chmod 600 $(IROOT)$(LFILE)
45 - chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE)
46 - test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/
47 - $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir)
48 - $(LN_S) -f at $(IROOT)$(bindir)/atq
49 - $(LN_S) -f at $(IROOT)$(bindir)/atrm
50 - $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir)
51 - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir)
52 - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir)
53 - $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir)
54 - $(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir)
55 - $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir)
56 - $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/
57 - cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
58 - $(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/
59 + $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir)
60 + $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir)
61 + $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir)
62 + $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir)
63 + $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir)
64 + $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
65 + chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
66 + touch $(DESTDIR)$(LFILE)
67 + chmod 600 $(DESTDIR)$(LFILE)
68 + chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE)
69 + test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/
70 + $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(DESTDIR)$(bindir)
71 + $(LN_S) -f at $(DESTDIR)$(bindir)/atq
72 + $(LN_S) -f at $(DESTDIR)$(bindir)/atrm
73 + $(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir)
74 + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir)
75 + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir)
76 + $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir)
77 + $(INSTALL) -g root -o root -m 755 atd $(DESTDIR)$(sbindir)
78 + $(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir)
79 + $(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/
80 + cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
81 + $(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/
82 sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman
83 - $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8
84 + $(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
86 - $(INSTALL) -g root -o root -m 644 at.allow.5 $(IROOT)$(man5dir)/
87 - cd $(IROOT)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
88 - $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir)
89 - rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \
90 - $(IROOT)$(mandir)/cat1/atq.1*
91 - rm -f $(IROOT)$(mandir)/cat1/atd.8*
92 + $(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
93 + cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
94 + $(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
95 + rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \
96 + $(DESTDIR)$(mandir)/cat1/atq.1*
97 + rm -f $(DESTDIR)$(mandir)/cat1/atd.8*
98 if test x"$(systemdsystemunitdir)" != xno; then \
99 - $(INSTALL) -o root -g root -m 755 -d $(IROOT)$(systemdsystemunitdir); \
100 - $(INSTALL) -o root -g root -m 644 atd.service $(IROOT)$(systemdsystemunitdir); \
101 + $(INSTALL) -o root -g root -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \
102 + $(INSTALL) -o root -g root -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \
105 dist: checkin $(DIST) $(LIST) Filelist.asc