[patch] arptables Makefile cleanup and honour DESTDIR
Peter Volkov <[email protected]>
| Newsgroups | gmane.linux.network.bridge.ebtables.devel |
|---|---|
| Message-ID | <1187009202.17899.7.camel@localhost> |
Hello, Bart. Thank you for applying previous patches. Of course your corrections were right. In attachment there is similar patch for arptables Makefile. Besides changing DESTDIR, there are other two small changes (I do not think worth separate patches): 1. It removes completely not used anywhere EXTRAS, EXTRA_INSTALLS and $(BINDIR)/arptables. 2. Removes -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" as it is not used anywhere else in the code. BTW. arptables-0.0.3-2 does not compiles with the recent kernels. Is there any ETA for new release? -- Peter. ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ Ebtables-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ebtables-devel
arptables-makefile.patch
(text/x-patch, 1.9 KB)
--- ./Makefile.orig 2007-08-13 16:20:12.000000000 +0400 +++ ./Makefile 2007-08-13 16:32:13.000000000 +0400 @@ -14,13 +14,6 @@ MANDIR:=$(PREFIX)/man DESTDIR:= -# include DESTDIR param -override LIBDIR:=$(DESTDIR)$(LIBDIR) -override MANDIR:=$(DESTDIR)$(MANDIR) -override BINDIR:=$(DESTDIR)$(BINDIR) - - -BINFILE:=$(BINDIR)/arptables # directory for new arptables releases RELEASE_DIR:=/tmp @@ -28,9 +21,6 @@ COPT_FLAGS:=-O2 CFLAGS:=$(COPT_FLAGS) -Wall -Wunused -I$(KERNEL_DIR)/include/ -Iinclude/ -DARPTABLES_VERSION=\"$(ARPTABLES_VERSION)\" #-g -DDEBUG #-pg # -DARPTC_DEBUG -EXTRAS+=iptables iptables.o -EXTRA_INSTALLS+=$(BINDIR)/iptables $(MANDIR)/man8/iptables.8 - ifndef ARPT_LIBDIR ARPT_LIBDIR:=$(LIBDIR)/arptables endif @@ -40,29 +30,25 @@ all: arptables arptables.o: arptables.c - $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< arptables-standalone.o: arptables-standalone.c - $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< libarptc/libarptc.o: libarptc/libarptc.c libarptc/libarptc_incl.c - $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< arptables: arptables-standalone.o arptables.o libarptc/libarptc.o $(EXT_OBJS) - $(CC) $(CFLAGS) -o $@ $^ - -$(BINDIR)/arptables: arptables - mkdir -p $(BINDIR) - cp $< $@ + $(CC) $(CFLAGS) -o $@ $^ $(MANDIR)/man8/arptables.8: arptables.8 - mkdir -p $(@D) - install -m 0644 -o root -g root $< $@ + mkdir -p $(DESTDIR)$(@D) + install -m 0644 -o root -g root $< $(DESTDIR)$@ .PHONY: exec exec: arptables - mkdir -p $(BINDIR) - install -m 0755 -o root -g root $< $(BINFILE) + mkdir -p $(DESTDIR)$(BINDIR) + install -m 0755 -o root -g root $< $(DESTDIR)$(BINDIR)/arptables .PHONY: install install: $(MANDIR)/man8/arptables.8 exec
signature.asc
(application/pgp-signature, 189 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (GNU/Linux) iD8DBQBGwFKxz6tlgEWSarMRAvnNAKCqcmK+O4o0zNPVzkbtYTMRpH05kQCfQLiz y/s0fmg05pxvnTfIBXhtIb8= =rcKz -----END PGP SIGNATURE-----