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