diff --git a/Makefile b/Makefile index 5499aed..c446af8 100644 --- a/Makefile +++ b/Makefile @@ -106,14 +106,17 @@ setup: .PHONY: install uninstall +SAKE=$(datadir)/$(PROJECT)/sake/ + install: all - test -d $(bindir) || mkdir --verbose --parents $(bindir) - test -d $(datadir)/$(PROJECT) || mkdir --verbose --parents $(datadir)/$(PROJECT) - test -d $(mandir)/man1 || mkdir --verbose --parents $(mandir)/man1 + install --directory $(bindir) $(datadir) $(mandir)/man1 $(SAKE)/{make.d,milligram} install --verbose --compare --mode 555 bin/* $(bindir) - install --verbose --compare --mode 644 share/* $(datadir)/$(PROJECT) + install --verbose --compare --mode 644 share/*.* $(datadir)/$(PROJECT) install --verbose --compare --mode 644 $(ManPage) $(mandir)/man1 + install --verbose --compare --mode 644 share/sake/make.d/*.* $(SAKE)/make.d + install --verbose --compare --mode 644 share/sake/milligram/*.* $(SAKE)/milligram sed -i -e "s#DATADIR='.*'#DATADIR='$(datadir)'#" $(bindir)/jqt + sed -i -e "s#DATADIR='.*'#DATADIR='$(datadir)'#" $(bindir)/sake uninstall: rm --verbose --force -- $(addprefix $(prefix)/,$(wildcard bin/*)) diff --git a/README.md b/README.md index c41716e..c6b1ca4 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,8 @@ The file `Makefile` concentrates all the routine procedures, like running the te or install last versions of scripts in the system directories. The main defined _targets_ are: +* `list`: list all targets defined in the Makefile. + * `check`: run the _jqt_ tests. This is the default target. * `clean`: remove all files generated during tests execution. @@ -39,8 +41,6 @@ are: * `uninstall`: remove installed files from the system directories. -* `help`: list all targets defined in the Makefile. - ### Installation In systems with the GNU software installed tools such as [Bash](https://www.gnu.org/software/bash/), @@ -50,7 +50,7 @@ or [Pandoc](http://pandoc.org/); for example, in recent _Fedora Linux_ distribut the following command will install all the extra software _jqt_ needs: ```zsh -$ sudo dnf -y install make general-purpose-preprocessor jq pandoc PyYAML +$ sudo dnf -y install make general-purpose-preprocessor jq pandoc python2-pyyaml ``` To install _jqt_ simply run `make install` on the _jqt_ repository top @@ -67,7 +67,7 @@ _jqt_ top directory: ```zsh $ sudo mkdir -p /usr/local/bin /usr/local/share/jqt $ sudo cp bin/* /usr/local/bin -$ sudo cp share/* /usr/local/share/jqt +$ sudo cp -r share/* /usr/local/share/jqt $ [[ $PATH =~ /usr/local/bin ]] || echo 'Add /usr/local/bin to your PATH' ``` @@ -84,9 +84,9 @@ another `jqt` uses. ### Documentation -The directory [`docs`](./docs/) contains the source files for _jqt_ documentation, and is in itself a subproject with his -own makefile. Please see the directory [`docs`](./docs/) for all information on -this subproject. +The directory [`docs`](./docs/) contains the source files for _jqt_ +documentation. Please see the directory [`docs`](./docs/) for all information +on this subproject.