From f0cccbd5a298e0941ff2bb7d874ca3792b4eee4c Mon Sep 17 00:00:00 2001 From: Loup Vaillant Date: Sat, 23 Sep 2017 12:07:24 +0200 Subject: [PATCH] Man pages belong to $(DESTDIR)/$(PREFIX)/share/man/man3 folder They were originally sent to the man3monocypher folder instead, but we don't need that: their .3monocypher extension already takes care of the disambiguation. It also has the advantage of allowing the user to search for the man page in section 3 directly. --- doc/man/{3monocypher => man3}/crypto_aead_lock.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_aead_unlock.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_argon2i.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_blake2b.3monocypher | 0 .../{3monocypher => man3}/crypto_blake2b_final.3monocypher | 0 .../{3monocypher => man3}/crypto_blake2b_general.3monocypher | 0 .../crypto_blake2b_general_init.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_blake2b_init.3monocypher | 0 .../{3monocypher => man3}/crypto_blake2b_update.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_chacha20_H.3monocypher | 0 .../{3monocypher => man3}/crypto_chacha20_encrypt.3monocypher | 0 .../{3monocypher => man3}/crypto_chacha20_init.3monocypher | 0 .../{3monocypher => man3}/crypto_chacha20_set_ctr.3monocypher | 0 .../{3monocypher => man3}/crypto_chacha20_stream.3monocypher | 0 .../{3monocypher => man3}/crypto_chacha20_x_init.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_check.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_key_exchange.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_lock.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_memcmp.3monocypher | 0 .../{3monocypher => man3}/crypto_poly1305_auth.3monocypher | 0 .../{3monocypher => man3}/crypto_poly1305_final.3monocypher | 0 .../{3monocypher => man3}/crypto_poly1305_init.3monocypher | 0 .../{3monocypher => man3}/crypto_poly1305_update.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_sign.3monocypher | 0 .../{3monocypher => man3}/crypto_sign_public_key.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_unlock.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_x25519.3monocypher | 0 .../crypto_x25519_public_key.3monocypher | 0 doc/man/{3monocypher => man3}/crypto_zerocmp.3monocypher | 0 doc/man/{3monocypher => man3}/intro.3monocypher | 0 doc/man/{3monocypher => man3}/style.css | 0 makefile | 4 ++-- 32 files changed, 2 insertions(+), 2 deletions(-) rename doc/man/{3monocypher => man3}/crypto_aead_lock.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_aead_unlock.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_argon2i.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_blake2b.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_blake2b_final.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_blake2b_general.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_blake2b_general_init.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_blake2b_init.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_blake2b_update.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_chacha20_H.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_chacha20_encrypt.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_chacha20_init.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_chacha20_set_ctr.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_chacha20_stream.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_chacha20_x_init.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_check.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_key_exchange.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_lock.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_memcmp.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_poly1305_auth.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_poly1305_final.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_poly1305_init.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_poly1305_update.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_sign.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_sign_public_key.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_unlock.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_x25519.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_x25519_public_key.3monocypher (100%) rename doc/man/{3monocypher => man3}/crypto_zerocmp.3monocypher (100%) rename doc/man/{3monocypher => man3}/intro.3monocypher (100%) rename doc/man/{3monocypher => man3}/style.css (100%) diff --git a/doc/man/3monocypher/crypto_aead_lock.3monocypher b/doc/man/man3/crypto_aead_lock.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_aead_lock.3monocypher rename to doc/man/man3/crypto_aead_lock.3monocypher diff --git a/doc/man/3monocypher/crypto_aead_unlock.3monocypher b/doc/man/man3/crypto_aead_unlock.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_aead_unlock.3monocypher rename to doc/man/man3/crypto_aead_unlock.3monocypher diff --git a/doc/man/3monocypher/crypto_argon2i.3monocypher b/doc/man/man3/crypto_argon2i.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_argon2i.3monocypher rename to doc/man/man3/crypto_argon2i.3monocypher diff --git a/doc/man/3monocypher/crypto_blake2b.3monocypher b/doc/man/man3/crypto_blake2b.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_blake2b.3monocypher rename to doc/man/man3/crypto_blake2b.3monocypher diff --git a/doc/man/3monocypher/crypto_blake2b_final.3monocypher b/doc/man/man3/crypto_blake2b_final.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_blake2b_final.3monocypher rename to doc/man/man3/crypto_blake2b_final.3monocypher diff --git a/doc/man/3monocypher/crypto_blake2b_general.3monocypher b/doc/man/man3/crypto_blake2b_general.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_blake2b_general.3monocypher rename to doc/man/man3/crypto_blake2b_general.3monocypher diff --git a/doc/man/3monocypher/crypto_blake2b_general_init.3monocypher b/doc/man/man3/crypto_blake2b_general_init.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_blake2b_general_init.3monocypher rename to doc/man/man3/crypto_blake2b_general_init.3monocypher diff --git a/doc/man/3monocypher/crypto_blake2b_init.3monocypher b/doc/man/man3/crypto_blake2b_init.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_blake2b_init.3monocypher rename to doc/man/man3/crypto_blake2b_init.3monocypher diff --git a/doc/man/3monocypher/crypto_blake2b_update.3monocypher b/doc/man/man3/crypto_blake2b_update.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_blake2b_update.3monocypher rename to doc/man/man3/crypto_blake2b_update.3monocypher diff --git a/doc/man/3monocypher/crypto_chacha20_H.3monocypher b/doc/man/man3/crypto_chacha20_H.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_chacha20_H.3monocypher rename to doc/man/man3/crypto_chacha20_H.3monocypher diff --git a/doc/man/3monocypher/crypto_chacha20_encrypt.3monocypher b/doc/man/man3/crypto_chacha20_encrypt.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_chacha20_encrypt.3monocypher rename to doc/man/man3/crypto_chacha20_encrypt.3monocypher diff --git a/doc/man/3monocypher/crypto_chacha20_init.3monocypher b/doc/man/man3/crypto_chacha20_init.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_chacha20_init.3monocypher rename to doc/man/man3/crypto_chacha20_init.3monocypher diff --git a/doc/man/3monocypher/crypto_chacha20_set_ctr.3monocypher b/doc/man/man3/crypto_chacha20_set_ctr.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_chacha20_set_ctr.3monocypher rename to doc/man/man3/crypto_chacha20_set_ctr.3monocypher diff --git a/doc/man/3monocypher/crypto_chacha20_stream.3monocypher b/doc/man/man3/crypto_chacha20_stream.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_chacha20_stream.3monocypher rename to doc/man/man3/crypto_chacha20_stream.3monocypher diff --git a/doc/man/3monocypher/crypto_chacha20_x_init.3monocypher b/doc/man/man3/crypto_chacha20_x_init.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_chacha20_x_init.3monocypher rename to doc/man/man3/crypto_chacha20_x_init.3monocypher diff --git a/doc/man/3monocypher/crypto_check.3monocypher b/doc/man/man3/crypto_check.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_check.3monocypher rename to doc/man/man3/crypto_check.3monocypher diff --git a/doc/man/3monocypher/crypto_key_exchange.3monocypher b/doc/man/man3/crypto_key_exchange.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_key_exchange.3monocypher rename to doc/man/man3/crypto_key_exchange.3monocypher diff --git a/doc/man/3monocypher/crypto_lock.3monocypher b/doc/man/man3/crypto_lock.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_lock.3monocypher rename to doc/man/man3/crypto_lock.3monocypher diff --git a/doc/man/3monocypher/crypto_memcmp.3monocypher b/doc/man/man3/crypto_memcmp.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_memcmp.3monocypher rename to doc/man/man3/crypto_memcmp.3monocypher diff --git a/doc/man/3monocypher/crypto_poly1305_auth.3monocypher b/doc/man/man3/crypto_poly1305_auth.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_poly1305_auth.3monocypher rename to doc/man/man3/crypto_poly1305_auth.3monocypher diff --git a/doc/man/3monocypher/crypto_poly1305_final.3monocypher b/doc/man/man3/crypto_poly1305_final.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_poly1305_final.3monocypher rename to doc/man/man3/crypto_poly1305_final.3monocypher diff --git a/doc/man/3monocypher/crypto_poly1305_init.3monocypher b/doc/man/man3/crypto_poly1305_init.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_poly1305_init.3monocypher rename to doc/man/man3/crypto_poly1305_init.3monocypher diff --git a/doc/man/3monocypher/crypto_poly1305_update.3monocypher b/doc/man/man3/crypto_poly1305_update.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_poly1305_update.3monocypher rename to doc/man/man3/crypto_poly1305_update.3monocypher diff --git a/doc/man/3monocypher/crypto_sign.3monocypher b/doc/man/man3/crypto_sign.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_sign.3monocypher rename to doc/man/man3/crypto_sign.3monocypher diff --git a/doc/man/3monocypher/crypto_sign_public_key.3monocypher b/doc/man/man3/crypto_sign_public_key.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_sign_public_key.3monocypher rename to doc/man/man3/crypto_sign_public_key.3monocypher diff --git a/doc/man/3monocypher/crypto_unlock.3monocypher b/doc/man/man3/crypto_unlock.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_unlock.3monocypher rename to doc/man/man3/crypto_unlock.3monocypher diff --git a/doc/man/3monocypher/crypto_x25519.3monocypher b/doc/man/man3/crypto_x25519.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_x25519.3monocypher rename to doc/man/man3/crypto_x25519.3monocypher diff --git a/doc/man/3monocypher/crypto_x25519_public_key.3monocypher b/doc/man/man3/crypto_x25519_public_key.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_x25519_public_key.3monocypher rename to doc/man/man3/crypto_x25519_public_key.3monocypher diff --git a/doc/man/3monocypher/crypto_zerocmp.3monocypher b/doc/man/man3/crypto_zerocmp.3monocypher similarity index 100% rename from doc/man/3monocypher/crypto_zerocmp.3monocypher rename to doc/man/man3/crypto_zerocmp.3monocypher diff --git a/doc/man/3monocypher/intro.3monocypher b/doc/man/man3/intro.3monocypher similarity index 100% rename from doc/man/3monocypher/intro.3monocypher rename to doc/man/man3/intro.3monocypher diff --git a/doc/man/3monocypher/style.css b/doc/man/man3/style.css similarity index 100% rename from doc/man/3monocypher/style.css rename to doc/man/man3/style.css diff --git a/makefile b/makefile index 50b407b..43877bc 100644 --- a/makefile +++ b/makefile @@ -22,7 +22,7 @@ CFLAGS= -pedantic -Wall -Wextra -O3 -march=native DESTDIR= PREFIX=usr/local PKGCONFIG=$(DESTDIR)usr/local/lib/pkgconfig -MAN_DIR=$(DESTDIR)/$(PREFIX)/share/man/man3monocypher +MAN_DIR=$(DESTDIR)/$(PREFIX)/share/man/man3 .PHONY: all library static-library dynamic-library clean install test speed @@ -45,7 +45,7 @@ install: library src/monocypher.h @echo 'Libs: -L$${libdir} -lmonocypher' >> /$(PKGCONFIG)/monocypher.pc @echo 'Cflags: -I$${includedir}' >> /$(PKGCONFIG)/monocypher.pc mkdir -p $(MAN_DIR) - cp -r doc/man/3monocypher/* $(MAN_DIR) + cp -r doc/man/man3/* $(MAN_DIR) mandb library: static-library dynamic-library -- 2.47.3