diff options
| author | Luca <deri@ntop.org> | 2018-11-30 08:40:37 +0100 |
|---|---|---|
| committer | Luca <deri@ntop.org> | 2018-11-30 08:40:37 +0100 |
| commit | 2993d9d37e994e58ed166501a306f3edbf2f0d07 (patch) | |
| tree | ed45f039bf4fc4b2fbf1f8d0ee8de8a251056ae5 | |
| parent | bae75c8f9b90c8655cc1e67c85a52e66f6121b52 (diff) | |
| parent | b6be0eebf6672c7c8127ea7a1e7fde2d6c3ae3e0 (diff) | |
Merge branch 'dev' of https://github.com/ntop/nDPI into dev
| -rw-r--r-- | packages/rpm/ndpi.spec.in | 2 | ||||
| -rw-r--r-- | packages/ubuntu/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/rpm/ndpi.spec.in b/packages/rpm/ndpi.spec.in index 5d8f21a01..90d9c51d7 100644 --- a/packages/rpm/ndpi.spec.in +++ b/packages/rpm/ndpi.spec.in @@ -56,7 +56,7 @@ mkdir -p $RPM_BUILD_ROOT%{libdir} mkdir -p $RPM_BUILD_ROOT%{bindir} cd $HOME/nDPI; make DESTDIR=$RPM_BUILD_ROOT install; rm $RPM_BUILD_ROOT%{libdir}/libndpi.so -ln -sr $RPM_BUILD_ROOT%{libdir}/libndpi.so.@PACKAGE_VERSION@ $RPM_BUILD_ROOT%{libdir}/libndpi.so +cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.2.5.0 libndpi.so; cd - mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d cp $HOME/nDPI/packages/etc/ld.so.conf.d/ndpi.conf $RPM_BUILD_ROOT/etc/ld.so.conf.d strip $RPM_BUILD_ROOT%{bindir}/* diff --git a/packages/ubuntu/Makefile.in b/packages/ubuntu/Makefile.in index 33ecaac34..c55b379e0 100644 --- a/packages/ubuntu/Makefile.in +++ b/packages/ubuntu/Makefile.in @@ -21,7 +21,7 @@ ndpi: @find ./debian/ndpi-tmp -name "*~" -exec /bin/rm {} ';' @find ./debian/ndpi-dev-tmp -name "*~" -exec /bin/rm {} ';' dpkg-buildpackage -rfakeroot -d -us -uc - dpkg-sig --sign builder -k 7921DF34 ../ndpi*deb + dpkg-sig --sign builder -k D1EB60BE ../ndpi*deb @\rm -f ../ndpi*dsc ../ndpi*.gz ../ndpi*changes @/bin/mv ../ndpi*deb . @echo |