diff options
| author | Aaron Conole <aconole@redhat.com> | 2017-01-26 14:07:00 -0500 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@samsung.com> | 2019-08-09 11:03:54 +0300 |
| commit | 998368aa97166cb4a4894777fcec0e102a3bfd09 (patch) | |
| tree | 88bfd7cf743c4d36788a394e60be28e5c432b206 | |
| parent | a5b786a01e050bea312539a4bf850826686538b4 (diff) | |
| download | openvswitch-998368aa97166cb4a4894777fcec0e102a3bfd09.tar.gz | |
libX.pc: use the correct output directory
When the ovsdb library pkgconfig changes were introduced, they placed
generated output in the src directory. This is incorrect, however, as
the output files should actually be placed in the build directory. It
is only seen when running `make distcheck` after enabling shared
libraries (ex: `./configure --enable-shared`).
Fixes: commit e72e07a97e95 ("lib: Add support for pkgconfig for libovsdb.")
Signed-off-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
| -rw-r--r-- | lib/automake.mk | 4 | ||||
| -rw-r--r-- | ofproto/automake.mk | 2 | ||||
| -rw-r--r-- | ovsdb/automake.mk | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/automake.mk b/lib/automake.mk index 4e666df69..9be29d910 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -431,8 +431,8 @@ lib_libopenvswitch_la_SOURCES += lib/stream-nossl.c endif pkgconfig_DATA += \ - $(srcdir)/lib/libopenvswitch.pc \ - $(srcdir)/lib/libsflow.pc + lib/libopenvswitch.pc \ + lib/libsflow.pc EXTRA_DIST += \ lib/dh1024.pem \ diff --git a/ofproto/automake.mk b/ofproto/automake.mk index aa94e6d86..7c08b563b 100644 --- a/ofproto/automake.mk +++ b/ofproto/automake.mk @@ -62,7 +62,7 @@ ofproto_libofproto_la_LIBADD += ${PTHREAD_LIBS} endif pkgconfig_DATA += \ - $(srcdir)/ofproto/libofproto.pc + ofproto/libofproto.pc # Distribute this generated file in order not to require Python at # build time if ofproto/ipfix.xml is not modified. diff --git a/ovsdb/automake.mk b/ovsdb/automake.mk index 81695f1a0..84aed2a33 100644 --- a/ovsdb/automake.mk +++ b/ovsdb/automake.mk @@ -40,7 +40,7 @@ ovsdb_libovsdb_la_CFLAGS = $(AM_CFLAGS) ovsdb_libovsdb_la_CPPFLAGS = $(AM_CPPFLAGS) pkgconfig_DATA += \ - $(srcdir)/ovsdb/libovsdb.pc + ovsdb/libovsdb.pc MAN_FRAGMENTS += \ ovsdb/remote-active.man \ |