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:05:33 +0300 |
| commit | 2f309c316b3e4c57da0c32382df6b361a0157e18 (patch) | |
| tree | 0be3a5999b2ade431864e23b301fac9c4a0635a6 | |
| parent | c179bd0c89a46835b2ea1814d1bfd2e0be419436 (diff) | |
| download | openvswitch-2f309c316b3e4c57da0c32382df6b361a0157e18.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 c360122b8..e5d21f8d1 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -429,8 +429,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 7486f2bb4..8d94599e1 100644 --- a/ofproto/automake.mk +++ b/ofproto/automake.mk @@ -58,7 +58,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 099ed3ceb..46520b477 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 \ |