Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- fix.tmp
- --------------------------------------------------------------------------------------
- diff -r a31d2f31dc11 Makefile
- --- a/Makefile Sat Jun 18 16:24:55 2011 -0700
- +++ b/Makefile Fri Jul 01 21:19:07 2011 +0200
- @@ -39,16 +39,17 @@
- sudo cp -r ./openni/include/ni/* /usr/include/openni/
- sudo cp -f ./openni/bin/ni* /usr/bin/
- @sed s/__VERSION__/${OPENNI_VERSION}~${DISTRO}/ ./CONTROL/openni.pc > /usr/lib/pkgconfig/openni.pc
- - sudo /bin/bash ./CONTROL/openni_postinst
- + sudo /bin/bash ./CONTROL/openni_postinst configure
- install_engine: install_openni ps_engine_lib
- sudo cp -f ./ps_engine/lib/*.so /usr/lib/
- sudo cp -f ./ps_engine/lib/*.ini /etc/primesense/
- sudo cp -f ./ps_engine/bin/XnSensorServer /usr/bin/
- sudo cp -f ./CONTROL/55-primesense-usb.rules /etc/udev/rules.d/
- - sudo /bin/bash ./CONTROL/engine_postinst
- + sudo /bin/bash ./CONTROL/engine_postinst configure
- install_nite: install_openni nite_lib
- + sudo mkdir -p /usr/include/nite
- sudo cp -f ./nite/build/Nite-1.3.1.5/Bin/*.so /usr/lib/
- sudo cp -f ./nite/build/Nite-1.3.1.5/Features_1_3_0/Bin/*.so /usr/lib/
- sudo cp -f ./nite/build/Nite-1.3.1.5/Features_1_3_1/Bin/*.so /usr/lib/
- @@ -58,12 +59,12 @@
- sudo cp -f ./nite/build/Nite-1.3.1.5/Data/*.xml /etc/primesense/
- sudo cp -f ./nite/build/Nite-1.3.1.5/Features_1_3_1/Data/* /etc/primesense/
- sudo cp -f ./nite/build/Nite-1.3.1.5/Hands_1_3_1/Data/* /etc/primesense/
- - sudo /bin/bash ./CONTROL/nite_postinst
- + sudo /bin/bash ./CONTROL/nite_postinst configure
- install: install_engine install_nite
- uninstall_openni:
- - sudo /bin/bash ./CONTROL/openni_prerm
- + sudo /bin/bash ./CONTROL/openni_prerm remove
- sudo rm -rf /usr/lib/libnimCodecs.so \
- /usr/lib/libnimMockNodes.so \
- /usr/lib/libnimRecorder.so \
- @@ -75,7 +76,7 @@
- /usr/bin/niReg \
- uninstall_engine:
- - sudo /bin/bash ./CONTROL/engine_prerm
- + sudo /bin/bash ./CONTROL/engine_prerm remove
- sudo rm -rf /etc/udev/rules.d/55-primesense-usb.rules \
- /etc/primesense/GlobalDefaults.ini \
- /usr/lib/libXnCore.so \
- @@ -86,7 +87,7 @@
- /usr/bin/XnSensorServer
- uninstall_nite:
- - sudo /bin/bash ./CONTROL/nite_prerm
- + sudo /bin/bash ./CONTROL/nite_prerm remove
- sudo rm -rf /etc/primesense/h.dat \
- /etc/primesense/Sample-User.xml \
- /etc/primesense/Nite.ini \
- ----------------------------------------------------------------------------------
- Error
- ----------------------------------------------------------------------------------
- [root@ABouchard-Workshop drivers]# patch < fix.tmp
- patching file Makefile
- Hunk #1 FAILED at 39.
- Hunk #2 FAILED at 58.
- Hunk #3 FAILED at 75.
- Hunk #4 FAILED at 86.
- 4 out of 4 hunks FAILED -- saving rejects to file Makefile.rej
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement