diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-03 13:59:04 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-03 14:29:13 +0100 |
| commit | 55c728031529910cd8358bedb90f75d363afeb4b (patch) | |
| tree | 5553cc267888f3b26e43af9fe2d6697b80361b8f /solaris | |
| parent | Merge pull request #153 from LabNConsulting/working/2.0/patch-set/rr-part2 (diff) | |
| download | frr-55c728031529910cd8358bedb90f75d363afeb4b.tar.xz frr-55c728031529910cd8358bedb90f75d363afeb4b.zip | |
*: Convert libzebra -> libfrr
The library libzebra that is installed with FRR will
conflict with Quagga. So let's rename it to libfrr.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'solaris')
| -rw-r--r-- | solaris/prototype.dev.in | 4 | ||||
| -rw-r--r-- | solaris/prototype.libs.in | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/solaris/prototype.dev.in b/solaris/prototype.dev.in index dd3ae399a..8bc3b3156 100644 --- a/solaris/prototype.dev.in +++ b/solaris/prototype.dev.in @@ -1,8 +1,8 @@ i pkginfo=$abs_builddir/pkginfo.dev.full i depend=$abs_builddir/depend.dev i copying=$abs_top_srcdir/COPYING -f none @libdir@/libzebra.la=$DESTDIR/@libdir@/libzebra.la 0755 root bin -f none @libdir@/libzebra.a=$DESTDIR/@libdir@/libzebra.a 0644 root bin +f none @libdir@/libfrr.la=$DESTDIR/@libdir@/libfrr.la 0755 root bin +f none @libdir@/libfrr.a=$DESTDIR/@libdir@/libfrr.a 0644 root bin f none @libdir@/libospf.la=$DESTDIR/@libdir@/libospf.la 0755 root bin f none @libdir@/libospf.a=$DESTDIR/@libdir@/libospf.a 0644 root bin f none @libdir@/libospfapiclient.la=$DESTDIR/@libdir@/libospfapiclient.la 0755 root bin diff --git a/solaris/prototype.libs.in b/solaris/prototype.libs.in index 71f4fd5cf..20aba05e4 100644 --- a/solaris/prototype.libs.in +++ b/solaris/prototype.libs.in @@ -2,9 +2,9 @@ i pkginfo=$abs_builddir/pkginfo.libs.full i depend=$abs_builddir/depend.libs i copying=$abs_top_srcdir/COPYING d none @libdir@=$DESTDIR/@libdir@ 0755 root bin -s none @libdir@/libzebra.so.0=libzebra.so.0.0.0 -f none @libdir@/libzebra.so.0.0.0=$DESTDIR/@libdir@/libzebra.so.0.0.0 0755 root bin -s none @libdir@/libzebra.so=libzebra.so.0.0.0 +s none @libdir@/libfrr.so.0=libfrr.so.0.0.0 +f none @libdir@/libfrr.so.0.0.0=$DESTDIR/@libdir@/libfrr.so.0.0.0 0755 root bin +s none @libdir@/libfrr.so=libfrr.so.0.0.0 s none @libdir@/libospf.so.0=libospf.so.0.0.0 f none @libdir@/libospf.so.0.0.0=$DESTDIR/@libdir@/libospf.so.0.0.0 0755 root bin s none @libdir@/libospf.so=libospf.so.0.0.0 |