diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/etc/ld.so.conf.d/ndpi.conf | 2 | ||||
| -rw-r--r-- | packages/rpm/ndpi.spec.in | 20 | ||||
| -rw-r--r-- | packages/ubuntu/Makefile.in | 18 |
3 files changed, 20 insertions, 20 deletions
diff --git a/packages/etc/ld.so.conf.d/ndpi.conf b/packages/etc/ld.so.conf.d/ndpi.conf index e8e4bdcd4..0bf940b3a 100644 --- a/packages/etc/ld.so.conf.d/ndpi.conf +++ b/packages/etc/ld.so.conf.d/ndpi.conf @@ -1 +1 @@ -/usr/local/lib +/usr/lib diff --git a/packages/rpm/ndpi.spec.in b/packages/rpm/ndpi.spec.in index 295dac1a8..b7d3a2937 100644 --- a/packages/rpm/ndpi.spec.in +++ b/packages/rpm/ndpi.spec.in @@ -43,9 +43,9 @@ you will need to install %{name}-dev. %build PATH=/usr/bin:/bin:/usr/sbin:/sbin -%define includedir /usr/local/include/ndpi -%define libdir /usr/local/lib -%define bindir /usr/local/bin +%define includedir /usr/include/ndpi +%define libdir /usr/lib +%define bindir /usr/bin %install PATH=/usr/bin:/bin:/usr/sbin:/sbin @@ -62,7 +62,7 @@ cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.@PACKAGE_VERSION@ libndpi.so.@MAJ cd $RPM_BUILD_ROOT%{libdir}/; ln -s libndpi.so.@PACKAGE_VERSION@ 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 -rm -rf $RPM_BUILD_ROOT/usr/local/sbin/ndpi +rm -rf $RPM_BUILD_ROOT/usr/sbin/ndpi strip $RPM_BUILD_ROOT%{bindir}/* rm -fr %{buildroot}%{includedir}/ndpi_win32.h #sed -i -e "s/#include \"ndpi_win32.h\"//g" %{buildroot}%{includedir}/ndpi_main.h @@ -73,12 +73,12 @@ rm -fr $RPM_BUILD_ROOT %files %defattr(-, root, root) -/usr/local/lib/libndpi.so -/usr/local/lib/libndpi.so.@MAJOR_RELEASE@ -/usr/local/lib/libndpi.so.@PACKAGE_VERSION@ -/usr/local/bin/ndpiReader -/usr/local/share/ndpi/ndpiCustomCategory.txt -/usr/local/share/ndpi/ndpiProtos.txt +/usr/lib/libndpi.so +/usr/lib/libndpi.so.@MAJOR_RELEASE@ +/usr/lib/libndpi.so.@PACKAGE_VERSION@ +/usr/bin/ndpiReader +/usr/share/ndpi/ndpiCustomCategory.txt +/usr/share/ndpi/ndpiProtos.txt /etc/ld.so.conf.d/ndpi.conf %{libdir}/pkgconfig/libndpi.pc diff --git a/packages/ubuntu/Makefile.in b/packages/ubuntu/Makefile.in index a728cd13b..0e131e52b 100644 --- a/packages/ubuntu/Makefile.in +++ b/packages/ubuntu/Makefile.in @@ -9,16 +9,16 @@ all: clean ndpi ndpi: \rm -rf ./debian/ndpi-tmp ./debian/ndpi-dev-tmp ./debian/ndpi ./debian/ndpi-dev mkdir -p ./debian/ndpi-tmp ./debian/ndpi-dev-tmp - mkdir -p ./debian/ndpi-tmp/usr/local/lib ./debian/ndpi-tmp/usr/local/bin - mkdir -p ./debian/ndpi-dev-tmp/usr/local/lib ./debian/ndpi-dev-tmp/usr/local/include/ndpi + mkdir -p ./debian/ndpi-tmp/usr/lib ./debian/ndpi-tmp/usr/bin + mkdir -p ./debian/ndpi-dev-tmp/usr/lib ./debian/ndpi-dev-tmp/usr/include/ndpi cd ${NDPI_HOME}; ./autogen.sh; ./configure; make - cp $(NDPI_HOME)/src/lib/libndpi.so.@NDPI_VERS@ ./debian/ndpi-tmp/usr/local/lib/ - cd ./debian/ndpi-tmp/usr/local/lib/; ln -s libndpi.so.@NDPI_VERS@ libndpi.so; cd - - cd ./debian/ndpi-tmp/usr/local/lib/; ln -s libndpi.so.@NDPI_VERS@ libndpi.so.@MAJOR_RELEASE@; cd - - cp $(NDPI_HOME)/src/lib/libndpi.a ./debian/ndpi-dev-tmp/usr/local/lib/ - cp $(NDPI_HOME)/example/ndpiReader ./debian/ndpi-tmp/usr/local/bin/ - cp $(NDPI_HOME)/src/include/*.h ./debian/ndpi-dev-tmp/usr/local/include/ndpi/ - -rm -fr ./debian/ndpi-dev-tmp/usr/local/include/ndpi/ndpi_win32.h* + cp $(NDPI_HOME)/src/lib/libndpi.so.@NDPI_VERS@ ./debian/ndpi-tmp/usr/lib/ + cd ./debian/ndpi-tmp/usr/lib/; ln -s libndpi.so.@NDPI_VERS@ libndpi.so; cd - + cd ./debian/ndpi-tmp/usr/lib/; ln -s libndpi.so.@NDPI_VERS@ libndpi.so.@MAJOR_RELEASE@; cd - + cp $(NDPI_HOME)/src/lib/libndpi.a ./debian/ndpi-dev-tmp/usr/lib/ + cp $(NDPI_HOME)/example/ndpiReader ./debian/ndpi-tmp/usr/bin/ + cp $(NDPI_HOME)/src/include/*.h ./debian/ndpi-dev-tmp/usr/include/ndpi/ + -rm -fr ./debian/ndpi-dev-tmp/usr/include/ndpi/ndpi_win32.h* @echo @find ./debian/ndpi-tmp -name "*~" -exec /bin/rm {} ';' @find ./debian/ndpi-dev-tmp -name "*~" -exec /bin/rm {} ';' |