diff options
| author | Dan Williams <dcbw@redhat.com> | 2010-10-18 19:02:27 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2010-10-18 19:02:27 -0500 |
| commit | 8f7aedc7e05f105eb70d5163d8a9963a3e30d30f (patch) | |
| tree | 1c3b16cd1c7d5641c8ec45080b0cff32e2449c01 /docs | |
| parent | fee318abdb0950fc2b58ff02948ceba3a1a56a39 (diff) | |
| parent | b368b8fea327caa972dc258933fd0e7d0f9e3381 (diff) | |
| download | NetworkManager-8f7aedc7e05f105eb70d5163d8a9963a3e30d30f.tar.gz | |
Merge remote branch 'origin/master' into rm-userset
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/Makefile.am b/docs/Makefile.am index fe74511025..5a3da7e067 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,7 +1,7 @@ -SUBDIRS = libnm-glib libnm-util - if WITH_DOCS +SUBDIRS = libnm-glib libnm-util + INCLUDES = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/libnm-util |