package/at/0003-Makefile.in-make-install-fix.patch

   1 [PATCH]: Makefile.in: fix make install for non-root, don't strip
   2
   3 Buildroot will ensure all files are owned by root and stripped anyway
   4 (if needed) before the rootfs is created.
   5
   6 [Vincent: tweak the patch for the new version]
   7
   8 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
   9 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
  10 ---
  11  Makefile.in | 43 +++++++++++++++++++++----------------------
  12  1 file changed, 21 insertions(+), 22 deletions(-)
  13
  14 diff --git a/Makefile.in b/Makefile.in
  15 index 1f699d9..f313f9b 100644
  16 --- a/Makefile.in
  17 +++ b/Makefile.in
  18 @@ -95,41 +95,40 @@ atrun: atrun.in
  19         $(CC) -c $(CFLAGS) $(DEFS) $*.c
  20
  21  install: all
  22 -       $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir)
  23 -       $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir)
  24 -       $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir)
  25 -       $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir)
  26 -       $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir)
  27 -       $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
  28 +       $(INSTALL) -m 755 -d $(DESTDIR)$(etcdir)
  29 +       $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
  30 +       $(INSTALL) -m 755 -d $(DESTDIR)$(sbindir)
  31 +       $(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
  32 +       $(INSTALL) -m 755 -d $(DESTDIR)$(atdocdir)
  33 +       $(INSTALL) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
  34         chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
  35         touch $(DESTDIR)$(LFILE)
  36         chmod 600 $(DESTDIR)$(LFILE)
  37 -       chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE)
  38 -       test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/
  39 -       $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(DESTDIR)$(bindir)
  40 +       test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -m 640 at.deny $(DESTDIR)$(etcdir)/
  41 +       $(INSTALL) -m 6755 at $(DESTDIR)$(bindir)
  42         $(LN_S) -f at $(DESTDIR)$(bindir)/atq
  43         $(LN_S) -f at $(DESTDIR)$(bindir)/atrm
  44 -       $(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir)
  45 -       $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir)
  46 -       $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir)
  47 -       $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir)
  48 -       $(INSTALL) -g root -o root -m 755 atd $(DESTDIR)$(sbindir)
  49 -       $(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir)
  50 -       $(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/
  51 +       $(INSTALL) -m 755 batch $(DESTDIR)$(bindir)
  52 +       $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
  53 +       $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
  54 +       $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
  55 +       $(INSTALL) -m 755 atd $(DESTDIR)$(sbindir)
  56 +       $(INSTALL) -m 755 atrun $(DESTDIR)$(sbindir)
  57 +       $(INSTALL) -m 644 at.1 $(DESTDIR)$(man1dir)/
  58         cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
  59 -       $(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/
  60 +       $(INSTALL) -m 644 atd.8 $(DESTDIR)$(man8dir)/
  61         sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman
  62 -       $(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
  63 +       $(INSTALL) -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
  64         rm -f tmpman
  65 -       $(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
  66 +       $(INSTALL) -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
  67         cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
  68 -       $(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
  69 +       $(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
  70         rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \
  71                 $(DESTDIR)$(mandir)/cat1/atq.1*
  72         rm -f $(DESTDIR)$(mandir)/cat1/atd.8*
  73         if test x"$(systemdsystemunitdir)" != xno; then \
  74 -               $(INSTALL) -o root -g root -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \
  75 -               $(INSTALL) -o root -g root -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \
  76 +               $(INSTALL) -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \
  77 +               $(INSTALL) -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \
  78         fi
  79
  80  dist: checkin $(DIST) $(LIST) Filelist.asc
  81 --
  82 2.4.10
  83