diff options
| author | Rob Austein <sra@hactrn.net> | 2016-07-12 12:27:57 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-07-12 12:27:57 -0400 |
| commit | 6bb5cea6d3e8bb59867e7730db433448fbe50de7 (patch) | |
| tree | 0cc287033497c22fb860e02e087315a1055e7699 | |
| parent | 9003788fd58f4a720181196c9a366abb67054073 (diff) | |
Move executables from $prefix/sbin to $prefix/bin.
| -rwxr-xr-x | build-homebrew-formula.py | 10 | ||||
| -rw-r--r-- | source/Makefile | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/build-homebrew-formula.py b/build-homebrew-formula.py index 007768f..cbaa35c 100755 --- a/build-homebrew-formula.py +++ b/build-homebrew-formula.py @@ -66,16 +66,16 @@ class CryptechAlpha < Formula # Install the Python scripts, then replace them with stubs which # set PYTHONPATH before calling the real scripts. - sbin.install "sw/stm32/projects/hsm/cryptech_upload" - sbin.install "sw/stm32/projects/hsm/cryptech_probe" - sbin.install "sw/stm32/projects/hsm/cryptech_miniterm" - sbin.env_script_all_files(libexec/"sbin", :PYTHONPATH => ENV["PYTHONPATH"]) + bin.install "sw/stm32/projects/hsm/cryptech_upload" + bin.install "sw/stm32/projects/hsm/cryptech_probe" + bin.install "sw/stm32/projects/hsm/cryptech_miniterm" + bin.env_script_all_files(libexec/"bin", :PYTHONPATH => ENV["PYTHONPATH"]) # Install other (non-Python) stuff, then we are done. share.install "cryptech-alpha-firmware.tar.gz" lib.install "sw/pkcs11/libpkcs11.dylib" - sbin.install "sw/pkcs11/p11util" + bin.install "sw/pkcs11/p11util" end end diff --git a/source/Makefile b/source/Makefile index dadb5dd..916d30b 100644 --- a/source/Makefile +++ b/source/Makefile @@ -20,10 +20,10 @@ install: all install -D -m 644 cryptech-alpha-firmware.tar.gz ${DESTDIR}/usr/share/cryptech-alpha-firmware.tar.gz install -D -m 644 sw/pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so ln -s libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so.0 - install -D sw/pkcs11/p11util ${DESTDIR}/usr/sbin/p11util -# install -D sw/pkcs11/libhal/cryptech_rpcd ${DESTDIR}/usr/sbin/cryptech_rpcd - install -D sw/stm32/projects/hsm/cryptech_upload ${DESTDIR}/usr/sbin/cryptech_upload - install -D sw/stm32/projects/hsm/cryptech_probe ${DESTDIR}/usr/sbin/cryptech_probe - install -D sw/stm32/projects/hsm/cryptech_miniterm ${DESTDIR}/usr/sbin/cryptech_miniterm + install -D sw/pkcs11/p11util ${DESTDIR}/usr/bin/p11util +# install -D sw/pkcs11/libhal/cryptech_rpcd ${DESTDIR}/usr/bin/cryptech_rpcd + install -D sw/stm32/projects/hsm/cryptech_upload ${DESTDIR}/usr/bin/cryptech_upload + install -D sw/stm32/projects/hsm/cryptech_probe ${DESTDIR}/usr/bin/cryptech_probe + install -D sw/stm32/projects/hsm/cryptech_miniterm ${DESTDIR}/usr/bin/cryptech_miniterm # Still need scripts to do something useful with the firmware tarball |