projects / packages / ebtables.git / blame
| Commit | Line | Data |
|---|---|---|
| 3b11dff3 JR |
1 | diff -up ebtables-v2.0.10-1/Makefile.orig ebtables-v2.0.10-1/Makefile |
| 2 | --- ebtables-v2.0.10-1/Makefile.orig 2011-07-10 05:28:52.000000000 -0400 | |
| 3 | +++ ebtables-v2.0.10-1/Makefile 2011-07-11 10:45:00.323426448 -0400 | |
| 4 | @@ -157,31 +157,31 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/ | |
| 5 | scripts: ebtables-save ebtables.sysv ebtables-config | |
| 6 | cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_ | |
| 7 | mkdir -p $(DESTDIR)$(BINDIR) | |
| 8 | - install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save | |
| 9 | + install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save | |
| 10 | cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_ | |
| 11 | if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(INITDIR); fi | |
| 12 | - if test -d $(DESTDIR)$(INITDIR); then install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi | |
| 13 | + if test -d $(DESTDIR)$(INITDIR); then install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables; fi | |
| 14 | cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_ | |
| 15 | if [ "$(DESTDIR)" != "" ]; then mkdir -p $(DESTDIR)$(SYSCONFIGDIR); fi | |
| 16 | - if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi | |
| 17 | + if test -d $(DESTDIR)$(SYSCONFIGDIR); then install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config; fi | |
| 18 | rm -f ebtables-save_ ebtables.sysv_ ebtables-config_ | |
| 19 | ||
| 20 | tmp4:=$(shell printf $(LOCKFILE) | sed 's/\//\\\//g') | |
| 21 | $(MANDIR)/man8/ebtables.8: ebtables.8 | |
| 22 | mkdir -p $(DESTDIR)$(@D) | |
| 23 | sed -e 's/$$(VERSION)/$(PROGVERSION)/' -e 's/$$(DATE)/$(PROGDATE)/' -e 's/$$(LOCKFILE)/$(tmp4)/' ebtables.8 > ebtables.8_ | |
| 24 | - install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@ | |
| 25 | + install -m 0644 ebtables.8_ $(DESTDIR)$@ | |
| 26 | rm -f ebtables.8_ | |
| 27 | ||
| 28 | $(DESTDIR)$(ETHERTYPESFILE): ethertypes | |
| 29 | mkdir -p $(@D) | |
| 30 | - install -m 0644 -o root -g root $< $@ | |
| 31 | + install -m 0644 $< $@ | |
| 32 | ||
| 33 | .PHONY: exec | |
| 34 | exec: ebtables ebtables-restore | |
| 35 | mkdir -p $(DESTDIR)$(BINDIR) | |
| 36 | - install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME) | |
| 37 | - install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore | |
| 38 | + install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME) | |
| 39 | + install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore | |
| 40 | ||
| 41 | .PHONY: install | |
| 42 | install: $(MANDIR)/man8/ebtables.8 $(DESTDIR)$(ETHERTYPESFILE) exec scripts | |
| 43 | @@ -205,18 +205,18 @@ release: | |
| 44 | rm -f extensions/ebt_inat.c | |
| 45 | rm -rf $(CVSDIRS) | |
| 46 | mkdir -p include/linux/netfilter_bridge | |
| 47 | - install -m 0644 -o root -g root \ | |
| 48 | + install -m 0644 \ | |
| 49 | $(KERNEL_INCLUDES)/linux/netfilter_bridge.h include/linux/ | |
| 50 | # To keep possible compile error complaints about undefined ETH_P_8021Q | |
| 51 | # off my back | |
| 52 | - install -m 0644 -o root -g root \ | |
| 53 | + install -m 0644 \ | |
| 54 | $(KERNEL_INCLUDES)/linux/if_ether.h include/linux/ | |
| 55 | - install -m 0644 -o root -g root \ | |
| 56 | + install -m 0644 \ | |
| 57 | $(KERNEL_INCLUDES)/linux/types.h include/linux/ | |
| 58 | - install -m 0644 -o root -g root \ | |
| 59 | + install -m 0644 \ | |
| 60 | $(KERNEL_INCLUDES)/linux/netfilter_bridge/*.h \ | |
| 61 | include/linux/netfilter_bridge/ | |
| 62 | - install -m 0644 -o root -g root \ | |
| 63 | + install -m 0644 \ | |
| 64 | include/ebtables.h include/linux/netfilter_bridge/ | |
| 65 | make clean | |
| 66 | touch * |