| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105 |
- --- ebtables-v2.0.9-1.orig/Makefile 2009-06-21 15:13:25.000000000 +0200
- +++ ebtables-v2.0.9-1/Makefile 2011-01-14 22:24:16.000000000 +0100
- @@ -8,17 +8,17 @@ PROGDATE:=June\ 2009
-
- # default paths
- LIBDIR:=/usr/lib
- -MANDIR:=/usr/local/man
- -BINDIR:=/usr/local/sbin
- +MANDIR:=/usr/man
- +BINDIR:=/usr/sbin
- ETCDIR:=/etc
- -INITDIR:=/etc/rc.d/init.d
- +INITDIR:=/etc/init.d
- SYSCONFIGDIR:=/etc/sysconfig
- DESTDIR:=
-
- -CFLAGS:=-Wall -Wunused
- +CFLAGS?=-Wall -Wunused
- +LDFLAGS?=
- CFLAGS_SH_LIB:=-fPIC
- -CC:=gcc
- -LD:=ld
- +CC?=gcc
-
- ifeq ($(shell uname -m),sparc64)
- CFLAGS+=-DEBT_MIN_ALIGN=8 -DKERNEL_64_USERSPACE_32
- @@ -85,14 +85,14 @@ ebtables-standalone.o: ebtables-standalo
-
- .PHONY: libebtc
- libebtc: $(OBJECTS2)
- - $(LD) -shared -soname libebtc.so -o libebtc.so -lc $(OBJECTS2)
- + $(CC) -shared $(LDFLAGS) -o libebtc.so -lc $(OBJECTS2)
-
- ebtables: $(OBJECTS) ebtables-standalone.o libebtc
- - $(CC) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- + $(CC) $(LDFLAGS) $(CFLAGS) $(CFLAGS_SH_LIB) -o $@ ebtables-standalone.o -I$(KERNEL_INCLUDES) -L. -Lextensions -lebtc $(EXT_LIBSI) \
- -Wl,-rpath,$(LIBDIR)
-
- ebtablesu: ebtablesu.c
- - $(CC) $(CFLAGS) $(PROGSPECSD) $< -o $@
- + $(CC) $(LDFLAGS) $(CFLAGS) $(PROGSPECSD) $< -o $@
-
- ebtablesd.o: ebtablesd.c include/ebtables_u.h
- $(CC) $(CFLAGS) $(PROGSPECSD) -c $< -o $@ -I$(KERNEL_INCLUDES)
- @@ -154,28 +154,29 @@ tmp3:=$(shell printf $(PIPE) | sed 's/\/
- .PHONY: scripts
- scripts: ebtables-save ebtables.sysv ebtables-config
- cat ebtables-save | sed 's/__EXEC_PATH__/$(tmp1)/g' > ebtables-save_
- - install -m 0755 -o root -g root ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
- + install -m 0755 ebtables-save_ $(DESTDIR)$(BINDIR)/ebtables-save
- cat ebtables.sysv | sed 's/__EXEC_PATH__/$(tmp1)/g' | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables.sysv_
- - install -m 0755 -o root -g root ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
- + mkdir -p $(DESTDIR)$(INITDIR)
- + install -m 0755 ebtables.sysv_ $(DESTDIR)$(INITDIR)/ebtables
- cat ebtables-config | sed 's/__SYSCONFIG__/$(tmp2)/g' > ebtables-config_
- - install -m 0600 -o root -g root ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
- + #install -m 0600 ebtables-config_ $(DESTDIR)$(SYSCONFIGDIR)/ebtables-config
- rm -f ebtables-save_ ebtables.sysv_ ebtables-config_
-
- $(MANDIR)/man8/ebtables.8: ebtables.8
- mkdir -p $(DESTDIR)$(@D)
- sed 's/$$(VERSION)/$(PROGVERSION)/' ebtables.8 | sed 's/$$(DATE)/$(PROGDATE)/' > ebtables.8_
- - install -m 0644 -o root -g root ebtables.8_ $(DESTDIR)$@
- + install -m 0644 ebtables.8_ $(DESTDIR)$@
- rm -f ebtables.8_
-
- $(ETHERTYPESFILE): ethertypes
- mkdir -p $(DESTDIR)$(@D)
- - install -m 0644 -o root -g root $< $(DESTDIR)$@
- + install -m 0644 $< $(DESTDIR)$@
-
- .PHONY: exec
- exec: ebtables ebtables-restore
- mkdir -p $(DESTDIR)$(BINDIR)
- - install -m 0755 -o root -g root $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
- - install -m 0755 -o root -g root ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
- + install -m 0755 $(PROGNAME) $(DESTDIR)$(BINDIR)/$(PROGNAME)
- + install -m 0755 ebtables-restore $(DESTDIR)$(BINDIR)/ebtables-restore
-
- .PHONY: install
- install: $(MANDIR)/man8/ebtables.8 $(ETHERTYPESFILE) exec scripts
- @@ -199,18 +200,18 @@ release:
- rm -f extensions/ebt_inat.c
- rm -rf $(CVSDIRS)
- mkdir -p include/linux/netfilter_bridge
- - install -m 0644 -o root -g root \
- + install -m 0644 \
- $(KERNEL_INCLUDES)/linux/netfilter_bridge.h include/linux/
- # To keep possible compile error complaints about undefined ETH_P_8021Q
- # off my back
- - install -m 0644 -o root -g root \
- + install -m 0644 \
- $(KERNEL_INCLUDES)/linux/if_ether.h include/linux/
- - install -m 0644 -o root -g root \
- + install -m 0644 \
- $(KERNEL_INCLUDES)/linux/types.h include/linux/
- - install -m 0644 -o root -g root \
- + install -m 0644 \
- $(KERNEL_INCLUDES)/linux/netfilter_bridge/*.h \
- include/linux/netfilter_bridge/
- - install -m 0644 -o root -g root \
- + install -m 0644 \
- include/ebtables.h include/linux/netfilter_bridge/
- make clean
- touch *
|
