0002-Makefile.in-make-install-fix.patch 4.0 KB

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