Skip to content

Commit

Permalink
Merge pull request #11 from zouharvi/master
Browse files Browse the repository at this point in the history
Add INSTALLDIR parameter
  • Loading branch information
robertostling authored Nov 17, 2019
2 parents c44a4d6 + 9ef1ace commit 7b97f19
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*.i*86
*.x86_64
*.hex
eflomal

# Debug files
*.dSYM/
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ CFLAGS=-Ofast -march=native -Wall --std=gnu99 -Wno-unused-function -g -fopenmp
# This is more suitable for debugging:
#CFLAGS=-Og -Wall --std=gnu99 -Wno-unused-function -g -fopenmp
LDFLAGS=-lm -lrt -lgomp -fopenmp
INSTALLDIR=/usr/local/bin

all: eflomal

Expand All @@ -11,7 +12,7 @@ eflomal.o: eflomal.c natmap.c hash.c random.c simd_math_prims.h
eflomal: eflomal.o

install: eflomal
install -t /usr/local/bin eflomal
install -t $(INSTALLDIR) eflomal

clean:
rm -f eflomal eflomal.o
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ To compile and install the C binary and the Python bindings:
sudo make install
python3 setup.py install

edit `Makefile` manually if you want to install somewhere other than the
default `/usr/local/bin`. Note that the `align.py` script now uses the
`eflomal` executable in the same directory as `align.py`, rather than in
`$PATH`.
Change the `INSTALLDIR` parameter in the install step if you want to install somewhere
other than the default `/usr/local/bin` (e.g. `make install -e INSTALLDIR=~/bin`).
Note that the `align.py` script now uses the `eflomal` executable in the same directory
as `align.py`, rather than in `$PATH`.


## Using
Expand Down

0 comments on commit 7b97f19

Please sign in to comment.