diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-03 14:43:55 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-02-03 14:43:55 +0100 |
| commit | 50b05f3c3dc197c0ba6f795b99b351b890a568ee (patch) | |
| tree | 36bcdf015a930ce07a4fcfc73537781230bb8dc1 /solaris | |
| parent | *: Convert libfpm -> libfrrfpm (diff) | |
| download | frr-50b05f3c3dc197c0ba6f795b99b351b890a568ee.tar.xz frr-50b05f3c3dc197c0ba6f795b99b351b890a568ee.zip | |
*: Convert libospf -> libfrrospf
Convert the libospfapiclient -> libfrrospfapiclient
and libospf -> libfrrospf to prevent namespace
collision with Quagga.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'solaris')
| -rw-r--r-- | solaris/prototype.dev.in | 8 | ||||
| -rw-r--r-- | solaris/prototype.libs.in | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/solaris/prototype.dev.in b/solaris/prototype.dev.in index 8bc3b3156..f40fbdcd5 100644 --- a/solaris/prototype.dev.in +++ b/solaris/prototype.dev.in @@ -3,10 +3,10 @@ i depend=$abs_builddir/depend.dev i copying=$abs_top_srcdir/COPYING 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 -f none @libdir@/libospfapiclient.a=$DESTDIR/@libdir@/libospfapiclient.a 0644 root bin +f none @libdir@/libfrrospf.la=$DESTDIR/@libdir@/libfrrospf.la 0755 root bin +f none @libdir@/libfrrospf.a=$DESTDIR/@libdir@/libfrrospf.a 0644 root bin +f none @libdir@/libfrrospfapiclient.la=$DESTDIR/@libdir@/libfrrospfapiclient.la 0755 root bin +f none @libdir@/libfrrospfapiclient.a=$DESTDIR/@libdir@/libfrrospfapiclient.a 0644 root bin d none @includedir@=$DESTDIR/@includedir@ 0755 root bin d none @includedir@/frr=$DESTDIR/@includedir@/frr 0755 root bin d none @includedir@/frr/ospfd=$DESTDIR/@includedir@/frr/ospfd 0755 root bin diff --git a/solaris/prototype.libs.in b/solaris/prototype.libs.in index 20aba05e4..07fe333ba 100644 --- a/solaris/prototype.libs.in +++ b/solaris/prototype.libs.in @@ -5,9 +5,9 @@ d none @libdir@=$DESTDIR/@libdir@ 0755 root bin 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 -f none @libdir@/libospfapiclient.so.0.0.0=$DESTDIR/@libdir@/libospfapiclient.so.0.0.0 0755 root bin -s none @libdir@/libospfapiclient.so.0=libospfapiclient.so.0.0.0 -s none @libdir@/libospfapiclient.so=libospfapiclient.so.0.0.0 +s none @libdir@/libfrrospf.so.0=libfrrospf.so.0.0.0 +f none @libdir@/libfrrospf.so.0.0.0=$DESTDIR/@libdir@/libfrrospf.so.0.0.0 0755 root bin +s none @libdir@/libfrrospf.so=libfrrospf.so.0.0.0 +f none @libdir@/libfrrospfapiclient.so.0.0.0=$DESTDIR/@libdir@/libfrrospfapiclient.so.0.0.0 0755 root bin +s none @libdir@/libfrrospfapiclient.so.0=libfrrospfapiclient.so.0.0.0 +s none @libdir@/libfrrospfapiclient.so=libfrrospfapiclient.so.0.0.0 |