diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-09-06 17:27:38 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-09-06 17:27:38 +0200 |
| commit | db5ff1d65f5b07beb34e288b067a39886ec91706 (patch) | |
| tree | 1a849fb6d627cd14edc82783be2bf281f4fa18ba | |
| parent | f0f24939e5100c9b42ce782d55f87161caf8739e (diff) | |
Add install target.
Make default PREFIX absolute, for being useful in subdirectories too.
Stop rm -rf $(INSTDIR), for being less dangerous.
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | README.md | 11 | ||||
| -rw-r--r-- | tools/Makefile | 3 |
3 files changed, 14 insertions, 8 deletions
@@ -1,6 +1,6 @@ # Makefile for catlfish -PREFIX=. +PREFIX=$(PWD) INSTDIR=$(PREFIX)/catlfish build all: @@ -11,11 +11,13 @@ clean: $(MAKE) -C doc $@ release: all - rm -rf $(INSTDIR) mkdir $(INSTDIR) ./makerelease.erl $(INSTDIR) -dist: release +install: release + make -C tools INSTDIR=$(INSTDIR) install + +dist: install (VER=$$(./version.erl) && \ ARCH=$$(uname -sm | sed -e 's/ /-/g') && \ N=catlfish-$${VER}_$${ARCH} && \ @@ -34,20 +34,21 @@ needed: - A compiled https://github.com/benoitc/hackney.git (http client) in ../hackney -- nettle-dev, libbsd-dev, librhash-dev (for using the permdb backend) +- Debian packages nettle-dev, libbsd-dev, librhash-dev, libpython-dev + (for using the permdb backend) Note: hackney is dependent on rebar, but doesn't include one. You can use the rebar from lager by adding "REBAR=../lager/rebar" to the make command line, or install rebar yourself. In order to perform merge operations, the following software packages -are needed: python-ecdsa, python-yaml. +are needed (Debian): python-ecdsa, python-yaml. In order to use the tools for submitting certificates, the following -software packages are needed: python-pyasn1, unzip. +software packages are needed (Debian): python-pyasn1, unzip. -In order to run the tests, the following software packagess are -needed: curl. +In order to run the tests, the following software packagess are needed +(Debian): curl. # Compile diff --git a/tools/Makefile b/tools/Makefile new file mode 100644 index 0000000..61c7351 --- /dev/null +++ b/tools/Makefile @@ -0,0 +1,3 @@ +install: + mkdir $(INSTDIR)/tools + cp *.py *.sh merge $(INSTDIR)/tools/ |