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