package/at/at-0005-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 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
   7 ---
   8  Makefile.in |   39 +++++++++++++++++++--------------------
   9  1 file changed, 19 insertions(+), 20 deletions(-)
  10
  11 Index: at-3.1.13/Makefile.in
  12 ===================================================================
  13 --- at-3.1.13.orig/Makefile.in
  14 +++ at-3.1.13/Makefile.in
  15 @@ -90,35 +90,34 @@ atrun: atrun.in
  16         $(CC) -c $(CFLAGS) $(DEFS) $*.c
  17
  18  install: all
  19 -       $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir)
  20 -       $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir)
  21 -       $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir)
  22 -       $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir)
  23 -       $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir)
  24 -       $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
  25 +       $(INSTALL) -m 755 -d $(DESTDIR)$(etcdir)
  26 +       $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
  27 +       $(INSTALL) -m 755 -d $(DESTDIR)$(sbindir)
  28 +       $(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
  29 +       $(INSTALL) -m 755 -d $(DESTDIR)$(atdocdir)
  30 +       $(INSTALL) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
  31         chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR)
  32         touch $(DESTDIR)$(LFILE)
  33         chmod 600 $(DESTDIR)$(LFILE)
  34 -       chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE)
  35 -       test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR$
  36 -       $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 -s at $(DESTDIR)$(bindir)
  37 +       test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -m 640 at.deny $(DESTDIR)$(etcdir)/
  38 +       $(INSTALL) -m 6755 at $(DESTDIR)$(bindir)
  39         $(LN_S) -f at $(DESTDIR)$(bindir)/atq
  40         $(LN_S) -f at $(DESTDIR)$(bindir)/atrm
  41 -       $(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir)
  42 -       $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir)
  43 -       $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir)
  44 -       $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir)
  45 -       $(INSTALL) -g root -o root -m 755 -s atd $(DESTDIR)$(sbindir)
  46 -       $(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir)
  47 -       $(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/
  48 +       $(INSTALL) -m 755 batch $(DESTDIR)$(bindir)
  49 +       $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
  50 +       $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
  51 +       $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir)
  52 +       $(INSTALL) -m 755 atd $(DESTDIR)$(sbindir)
  53 +       $(INSTALL) -m 755 atrun $(DESTDIR)$(sbindir)
  54 +       $(INSTALL) -m 644 at.1 $(DESTDIR)$(man1dir)/
  55         cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1
  56 -       $(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/
  57 +       $(INSTALL) -m 644 atd.8 $(DESTDIR)$(man8dir)/
  58         sed "s,\$${exec_prefix},$(exec_prefix),g" <atrun.8>tmpman
  59 -       $(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
  60 +       $(INSTALL) -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8
  61         rm -f tmpman
  62 -       $(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
  63 +       $(INSTALL) -m 644 at.allow.5 $(DESTDIR)$(man5dir)/
  64         cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5
  65 -       $(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
  66 +       $(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(atdocdir)
  67         rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \
  68                 $(DESTDIR)$(mandir)/cat1/atq.1*
  69         rm -f $(DESTDIR)$(mandir)/cat1/atd.8*