Correct installation to follow standards

This commit is contained in:
Ben Longbons 2014-06-24 11:10:27 -07:00
parent eb7a16376f
commit fee7a47aba
2 changed files with 6 additions and 2 deletions

View File

@ -7,6 +7,7 @@ script:
- ./.travis.check.style.sh
- make CC="$CC" RUSTC="$RUSTC" -j4
- make CC="$CC" RUSTC="$RUSTC" test -j4
- make install DESTDIR=${PWD}/destdir
env:
- ARCH=i686 CC='cc -m32'

View File

@ -1,6 +1,8 @@
RUSTC ?= rustc
RUSTC_FLAGS ?=
DESTDIR ?= /usr/local
DESTDIR ?=
PREFIX ?= /usr/local
BINDIR ?= $(PREFIX)/bin
# Link flags to pull in dependencies
BINS = cargo \
@ -75,7 +77,8 @@ distclean: clean
cd libs/toml-rs && make clean
install:
cp target/cargo target/cargo-* $(DESTDIR)/bin
install -d $(DESTDIR)$(BINDIR)
install target/cargo target/cargo-* $(DESTDIR)$(BINDIR)
# Setup phony tasks
.PHONY: all clean distclean test test-unit test-integration libcargo