patch-Makefile 3.0 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677
  1. --- ebtables-v2.0.9-1.orig/Makefile 2009-06-21 15:13:25.000000000 +0200
  2. +++ ebtables-v2.0.9-1/Makefile 2009-11-29 12:54:31.000000000 +0100
  3. @@ -8,10 +8,10 @@ PROGDATE:=June\ 2009
  4. # default paths
  5. LIBDIR:=/usr/lib
  6. -MANDIR:=/usr/local/man
  7. -BINDIR:=/usr/local/sbin
  8. +MANDIR:=/usr/man
  9. +BINDIR:=/usr/sbin
  10. ETCDIR:=/etc
  11. -INITDIR:=/etc/rc.d/init.d
  12. +INITDIR:=/etc/init.d
  13. SYSCONFIGDIR:=/etc/sysconfig
  14. DESTDIR:=
  15. @@ -154,28 +154,29 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/
  16. .PHONY: scripts
  17. scripts: ebtables-save ebtables.sysv ebtables-config
  18. cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
  19. - install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
  20. + install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
  21. cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
  22. - install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
  23. + mkdir -p $(DESTDIR)$(INITDIR)
  24. + install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
  25. cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
  26. - install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
  27. + #install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
  28. rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
  29. $(MANDIR)/man8/ebtables.8: ebtables.8
  30. mkdir -p $(DESTDIR)$(@D)
  31. sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_
  32. - install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
  33. + install -m 0644 ebtables.8_ $(DESTDIR)$@
  34. rm -f ebtables.8_
  35. $(ETHERTYPESFILE): ethertypes
  36. mkdir -p $(DESTDIR)$(@D)
  37. - install -m 0644 -o root -g root $< $(DESTDIR)$@
  38. + install -m 0644 $< $(DESTDIR)$@
  39. .PHONY: exec
  40. exec: ebtables ebtables-restore
  41. mkdir -p $(DESTDIR)$(BINDIR)
  42. - install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
  43. - install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
  44. + install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
  45. + install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
  46. .PHONY: install
  47. install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
  48. @@ -199,18 +200,18 @@ release:
  49. rm -f extensions/ebt_inat.c
  50. rm -rf $(CVSDIRS)
  51. mkdir -p include/linux/netfilter_bridge
  52. - install -m 0644 -o root -g root \
  53. + install -m 0644 \
  54. $(KERNEL_INCLUDES)/linux/netfilter_bridge.h include/linux/
  55. # To keep possible compile error complaints about undefined ETH_P_8021Q
  56. # off my back
  57. - install -m 0644 -o root -g root \
  58. + install -m 0644 \
  59. $(KERNEL_INCLUDES)/linux/if_ether.h include/linux/
  60. - install -m 0644 -o root -g root \
  61. + install -m 0644 \
  62. $(KERNEL_INCLUDES)/linux/types.h include/linux/
  63. - install -m 0644 -o root -g root \
  64. + install -m 0644 \
  65. $(KERNEL_INCLUDES)/linux/netfilter_bridge/*.h \
  66. include/linux/netfilter_bridge/
  67. - install -m 0644 -o root -g root \
  68. + install -m 0644 \
  69. include/ebtables.h include/linux/netfilter_bridge/
  70. make clean
  71. touch *