Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/iptables/patches/iptables-1.4.0-install-all-dev-files-2.patch

    Contents of /trunk/iptables/patches/iptables-1.4.0-install-all-dev-files-2.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 550 - (show annotations) (download)
    Thu Mar 27 11:25:32 2008 UTC (16 years, 1 month ago) by niro
    File size: 2752 byte(s) 
    -some headers do not exist anymore
    1 diff -Naur iptables-1.4.0/libiptc/Makefile iptables-1.4.0-magellan/libiptc/Makefile
    2 --- iptables-1.4.0/libiptc/Makefile 2007-01-23 13:49:53.000000000 +0100
    3 +++ iptables-1.4.0-magellan/libiptc/Makefile 2008-03-27 12:17:01.000000000 +0100
    4 @@ -17,8 +17,11 @@
    5 ifeq ($(DO_IPV6), 1)
    6 EXTRA_DEPENDS+= libiptc/libip6tc.d
    7 libiptc/libiptc.a: libiptc/libiptc.a(libiptc/libip6tc.o)
    8 +DEVEL_HEADERS+=include/libiptc/libip6tc.h
    9 endif
    10
    11 +DEVEL_HEADERS+=include/libiptc/libiptc.h include/libiptc/ipt_kernel_headers.h
    12 +
    13 libiptc/libip4tc.d libiptc/libip6tc.d: %.d: %.c
    14 @-$(CC) -M -MG $(CFLAGS) $< | sed -e 's@^.*\.o:@$*.d libiptc/libiptc.a($*.o):@' > $@
    15 endif
    16 diff -Naur iptables-1.4.0/Makefile iptables-1.4.0-magellan/Makefile
    17 --- iptables-1.4.0/Makefile 2007-12-22 13:44:46.000000000 +0100
    18 +++ iptables-1.4.0-magellan/Makefile 2008-03-27 12:25:36.000000000 +0100
    19 @@ -49,8 +49,10 @@
    20 CFLAGS += -DNO_SHARED_LIBS=1
    21 endif
    22
    23 -EXTRAS+=iptables iptables.o iptables.8
    24 +EXTRAS+=iptables iptables.o iptables.8 libiptables.a
    25 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables $(DESTDIR)$(MANDIR)/man8/iptables.8
    26 +DEVEL_HEADERS+=include/iptables.h
    27 +DEVEL_LIBS+=libiptables.a
    28
    29 # No longer experimental.
    30 ifneq ($(DO_MULTI), 1)
    31 @@ -59,13 +61,15 @@
    32 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/iptables-save $(DESTDIR)$(BINDIR)/iptables-restore $(DESTDIR)$(BINDIR)/iptables-xml $(DESTDIR)$(MANDIR)/man8/iptables-restore.8 $(DESTDIR)$(MANDIR)/man8/iptables-save.8
    33
    34 ifeq ($(DO_IPV6), 1)
    35 -EXTRAS+=ip6tables ip6tables.o ip6tables.8
    36 +EXTRAS+=ip6tables ip6tables.o ip6tables.8 libip6tables.a
    37 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables $(DESTDIR)$(MANDIR)/man8/ip6tables.8
    38
    39 ifneq ($(DO_MULTI), 1)
    40 EXTRAS+=ip6tables-save ip6tables-restore
    41 endif
    42 EXTRA_INSTALLS+=$(DESTDIR)$(BINDIR)/ip6tables-save $(DESTDIR)$(BINDIR)/ip6tables-restore $(DESTDIR)$(MANDIR)/man8/ip6tables-save.8 $(DESTDIR)$(MANDIR)/man8/ip6tables-restore.8
    43 +DEVEL_HEADERS+=include/ip6tables.h
    44 +DEVEL_LIBS+=libip6tables.a
    45 endif
    46
    47 ifndef IPT_LIBDIR
    48 @@ -102,6 +106,8 @@
    49 print-extensions:
    50 @[ -n "$(OPTIONALS)" ] && echo Extensions found: $(OPTIONALS)
    51
    52 +libiptables.a: libiptables.a(iptables.o)
    53 +
    54 iptables.o: iptables.c
    55 $(CC) $(CFLAGS) -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
    56
    57 @@ -156,6 +162,8 @@
    58 cp $< $@
    59 endif
    60
    61 +libip6tables.a: libip6tables.a(ip6tables.o)
    62 +
    63 ip6tables.o: ip6tables.c
    64 $(CC) $(CFLAGS) -DIP6T_LIB_DIR=\"$(IPT_LIBDIR)\" -c -o $@ $<
    65
    66 @@ -221,7 +229,7 @@
    67 .PHONY: install-devel-headers
    68 install-devel-headers: $(DEVEL_HEADERS)
    69 @[ -d $(DESTDIR)$(INCDIR) ] || mkdir -p $(DESTDIR)$(INCDIR)
    70 - @cp -v $(DEVEL_HEADERS) $(DESTDIR)$(INCDIR)
    71 + @cp -v --parents $(DEVEL_HEADERS) `echo $(DESTDIR)$(INCDIR) | sed -e "s:/include/\?::"`
    72
    73 .PHONY: install-devel-libs
    74 install-devel-libs: $(DEVEL_LIBS)