X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Rules.make;h=c0c50103834c40964a194f24588b20301f55761c;hb=refs%2Fheads%2Fplanetlab-4_0-branch;hp=e8aa160ee5a151348e076f49f432db8c475b2e0d;hpb=f7b70cf9e00324b89b02de213bcd0dde7044d035;p=iptables.git diff --git a/Rules.make b/Rules.make index e8aa160..c0c5010 100644 --- a/Rules.make +++ b/Rules.make @@ -11,9 +11,9 @@ clean: $(EXTRA_CLEANS) @find . -name '*.[ao]' -o -name '*.so' | xargs rm -f install: all $(EXTRA_INSTALLS) - @if [ -f /usr/bin/iptables -a "$(BINDIR)" = "/usr/sbin" ];\ - then echo 'Erasing iptables from old location (now /usr/sbin).';\ - rm -f /usr/bin/iptables;\ + @if [ -f /usr/local/bin/iptables -a "$(BINDIR)" = "/usr/local/sbin" ];\ + then echo 'Erasing iptables from old location (now /usr/local/sbin).';\ + rm -f /usr/local/bin/iptables;\ fi install-experimental: $(EXTRA_INSTALLS_EXP) @@ -31,7 +31,7 @@ $(SHARED_LIBS:%.so=%.d): %.d: %.c sed -e 's@^.*\.o:@$*.d $*_sh.o:@' > $@ $(SHARED_LIBS): %.so : %_sh.o - $(LD) -shared -o $@ $< + $(LD) -shared $(EXT_LDFLAGS) -o $@ $< %_sh.o : %.c $(CC) $(SH_CFLAGS) -o $@ -c $<