diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-04-05 18:11:56 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-04-05 18:12:48 +0200 |
| commit | c8cf36930144ea49d1f5cb29835547b1baededfd (patch) | |
| tree | 7e1ab88ae5b118b77f2e529407de09d81a6edc19 /utils | |
| parent | 1ac30c97c339957b6e3c5cf571de7bc38c827730 (diff) | |
| parent | e82a71d7de5f6e364738dbb7154b88bfff8a5fcd (diff) | |
Merge branch 'stable'
Resolve conflict with Nicolas' Dichtel update on utils/Makefile.am
for nfnl_osf.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/utils/Makefile.am b/utils/Makefile.am index bfafd1d0..c26aa640 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -11,7 +11,7 @@ if HAVE_LIBNFNETLINK sbin_PROGRAMS += nfnl_osf pkgdata_DATA += pf.os -nfnl_osf_LDADD = -lnfnetlink +nfnl_osf_LDADD = ${libnfnetlink_LIBS} endif if ENABLE_BPFC |