diff options
| author | gdt <gdt> | 2003-12-08 18:12:34 +0000 |
|---|---|---|
| committer | gdt <gdt> | 2003-12-08 18:12:34 +0000 |
| commit | af273652d500b7d3ed4de0da856634a3a0638e67 (patch) | |
| tree | b9a70e539dd2aa52b152cc0144c13c4f5eff8ada | |
| parent | 239aecc01cd8ef389b3684cff6ba372da51826ff (diff) | |
{lib,ospfd,ospfapi}/Makefile.am:
Use pkginclude_HEADERS rather than include_HEADERS to place includes
in ${prefix}/include/quaggainstead of polluting ${prefix}/include.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 10 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | ospfclient/Makefile.am | 2 | ||||
| -rw-r--r-- | ospfd/Makefile.am | 2 |
5 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2003-12-08 Greg Troxel <gdt@fnord.ir.bbn.com> + + * {lib,ospfd,ospfapi}/Makefile.am: Use pkginclude_HEADERS rather + than include_HEADERS to place includes in + ${prefix}/include/quaggainstead of polluting ${prefix}/include. + 2003-12-04 Greg Troxel <gdt@poblano.ir.bbn.com> * configure.ac: When setting exampledir to sysconfdir as a @@ -1,3 +1,13 @@ +* Changes in Quagga 0.96.5 + +- include files are installed in $(prefix)/include/quagga. Programs + building against these includes should -I$(prefix)/include and e.g. + #include <quagga/routemap.h> + +- New option --enable-exampledir puts example files in a separate + directory from $(sysconfdir), easing NetBSD pkgsrc hierarchy rules + compliance. + * Changes in Quagga 0.96.4 - Further fixes to ospfd, some relating to the PtP revert. Interface diff --git a/lib/Makefile.am b/lib/Makefile.am index 27981e52..391c2b7e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -16,7 +16,7 @@ libzebra_a_DEPENDENCIES = @LIB_REGEX@ libzebra_a_LIBADD = @LIB_REGEX@ -include_HEADERS = \ +pkginclude_HEADERS = \ buffer.h command.h filter.h getopt.h hash.h if.h linklist.h log.h \ memory.h network.h prefix.h routemap.h distribute.h sockunion.h \ str.h stream.h table.h thread.h vector.h version.h vty.h zebra.h \ diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am index fb041af9..035ee901 100644 --- a/ospfclient/Makefile.am +++ b/ospfclient/Makefile.am @@ -8,7 +8,7 @@ sbin_PROGRAMS = ospfclient libospfapiclient_a_SOURCES = \ ospf_apiclient.c -ospfapiheaderdir = $(includedir)/ospfapi +ospfapiheaderdir = $(pkgincludedir)/ospfapi ospfapiheader_HEADERS = \ ospf_apiclient.h diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am index f687ea9a..7018b46c 100644 --- a/ospfd/Makefile.am +++ b/ospfd/Makefile.am @@ -14,7 +14,7 @@ libospf_a_SOURCES = \ ospf_lsdb.c ospf_asbr.c ospf_routemap.c ospf_snmp.c \ ospf_opaque.c ospf_te.c ospf_vty.c ospf_api.c ospf_apiserver.c -ospfdheaderdir = $(includedir)/ospfd +ospfdheaderdir = $(pkgincludedir)/ospfd ospfdheader_HEADERS = \ ospf_api.h ospf_asbr.h ospf_dump.h ospf_lsa.h ospf_lsdb.h \ |