diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/radvd/patches/patch-Makefile_in | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/radvd/patches/patch-Makefile_in')
| -rw-r--r-- | package/radvd/patches/patch-Makefile_in | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/package/radvd/patches/patch-Makefile_in b/package/radvd/patches/patch-Makefile_in new file mode 100644 index 000000000..3825f23f1 --- /dev/null +++ b/package/radvd/patches/patch-Makefile_in @@ -0,0 +1,12 @@ +$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ +--- radvd-1.2.orig/Makefile.in 2008-10-28 17:38:37.000000000 +0100 ++++ radvd-1.2/Makefile.in 2009-05-30 17:07:08.814794942 +0200 +@@ -222,7 +222,7 @@ COMMON_SRC = log.c socket.c recv.c util. + radvd_SOURCES = $(COMMON_SRC) radvd.c timer.c send.c process.c interface.c \ + device.c device-common.c privsep.c gram.y gram.h scanner.l + +-radvd_LDADD = -lfl ++radvd_LDADD = + EXTRA_radvd_SOURCES = device-linux.c device-bsd44.c privsep-linux.c privsep-bsd44.c + YFLAGS = -d + radvdump_SOURCES = $(COMMON_SRC) radvdump.c |