diff --git a/Makefile b/Makefile index 083a91dac..457a5f991 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ MIN_RUSTC ?= 1.39.0 CARGO_BIN ?= cargo # Installation parameters -MANPAGES ?= meli.1 meli.conf.5 meli-themes.5 +MANPAGES ?= docs/meli.1 docs/meli.conf.5 docs/meli-themes.5 FEATURES ?= --features "${MELI_FEATURES}" MANPATHS != ACCUM="";for m in `manpath 2> /dev/null | tr ':' ' '`; do if [ -d "$${m}" ]; then REAL_PATH=`cd $${m} && pwd` ACCUM="$${ACCUM}:$${REAL_PATH}";fi;done;echo -n $${ACCUM} | sed 's/^://' diff --git a/build.rs b/build.rs index 4d2256963..d7190f9db 100644 --- a/build.rs +++ b/build.rs @@ -49,9 +49,9 @@ fn main() { let output = Command::new("mandoc") .args(MANDOC_OPTS) - .arg("meli.1") + .arg("docs/meli.1") .output() - .or_else(|_| Command::new("man").arg("-l").arg("meli.1").output()) + .or_else(|_| Command::new("man").arg("-l").arg("docs/meli.1").output()) .unwrap(); let mut file = File::create(&out_dir_path).unwrap(); @@ -61,9 +61,14 @@ fn main() { out_dir_path.push("meli.conf.txt"); let output = Command::new("mandoc") .args(MANDOC_OPTS) - .arg("meli.conf.5") + .arg("docs/meli.conf.5") .output() - .or_else(|_| Command::new("man").arg("-l").arg("meli.conf.5").output()) + .or_else(|_| { + Command::new("man") + .arg("-l") + .arg("docs/meli.conf.5") + .output() + }) .unwrap(); let mut file = File::create(&out_dir_path).unwrap(); file.write_all(&output.stdout).unwrap(); @@ -72,9 +77,14 @@ fn main() { out_dir_path.push("meli-themes.txt"); let output = Command::new("mandoc") .args(MANDOC_OPTS) - .arg("meli-themes.5") + .arg("docs/meli-themes.5") .output() - .or_else(|_| Command::new("man").arg("-l").arg("meli-themes.5").output()) + .or_else(|_| { + Command::new("man") + .arg("-l") + .arg("docs/meli-themes.5") + .output() + }) .unwrap(); let mut file = File::create(&out_dir_path).unwrap(); file.write_all(&output.stdout).unwrap(); diff --git a/debian/meli.docs b/debian/meli.docs index f61d6a3cb..152d2a7c8 100644 --- a/debian/meli.docs +++ b/debian/meli.docs @@ -1,3 +1,3 @@ -meli.1 -meli.conf.5 -meli-themes.5 +docs/meli.1 +docs/meli.conf.5 +docs/meli-themes.5 diff --git a/meli-themes.5 b/docs/meli-themes.5 similarity index 100% rename from meli-themes.5 rename to docs/meli-themes.5 diff --git a/meli.1 b/docs/meli.1 similarity index 100% rename from meli.1 rename to docs/meli.1 diff --git a/meli.conf.5 b/docs/meli.conf.5 similarity index 100% rename from meli.conf.5 rename to docs/meli.conf.5