Merge branch 'odin' of git.hitchhiker-linux.org:jeang3nie/seahag into odin
This commit is contained in:
commit
a4fb6c7060
3 changed files with 9 additions and 3 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -7,3 +7,5 @@ test/*
|
||||||
*.a
|
*.a
|
||||||
*.so
|
*.so
|
||||||
*.core
|
*.core
|
||||||
|
config.mk
|
||||||
|
|
||||||
|
|
|
@ -20,9 +20,9 @@ There is a simple test harness which can be invoked via `make test`. If you wish
|
||||||
to port this software to an untested platform the tests will greatly assist in
|
to port this software to an untested platform the tests will greatly assist in
|
||||||
that process.
|
that process.
|
||||||
> Note: if your OS uses **dash** as `/bin/sh` then the builtin echo command will not
|
> Note: if your OS uses **dash** as `/bin/sh` then the builtin echo command will not
|
||||||
> be up to the task of printing the escape sequences used by the test runner. If this
|
> be up to the task of printing the escape sequences used by the test runner. In
|
||||||
> bothers you, you can call `make` with the `SHELL` environment variable overridden
|
> this case, be sure to set the `ECHO` variable to `/bin/echo` in the *config.mk*
|
||||||
> by calling `make SHELL=/bin/bash all test`.
|
> file.
|
||||||
|
|
||||||
## Contributing
|
## Contributing
|
||||||
Contributions are always welcome and can be made via pull request or `git send-email`,
|
Contributions are always welcome and can be made via pull request or `git send-email`,
|
||||||
|
|
|
@ -5,6 +5,10 @@ libdir = $(DESTDIR)$(PREFIX)/lib
|
||||||
sharedir = $(DESTDIR)$(PREFIX)/share
|
sharedir = $(DESTDIR)$(PREFIX)/share
|
||||||
mandir = $(sharedir)/man
|
mandir = $(sharedir)/man
|
||||||
docdir = $(sharedir)/doc/haggis
|
docdir = $(sharedir)/doc/haggis
|
||||||
|
# We need an `echo` program that doesn't screw with terminal escape sequences.
|
||||||
|
# This only matters if /bin/sh is a symlink to dash, as the echo builtin in dash
|
||||||
|
# will screw with them and pass them as printed characters.
|
||||||
|
ECHO = /bin/echo
|
||||||
# Comment this line if your OS ships libmd as part of libc
|
# Comment this line if your OS ships libmd as part of libc
|
||||||
# (NetBSD, OpenBSD)
|
# (NetBSD, OpenBSD)
|
||||||
LIBS += -lmd
|
LIBS += -lmd
|
Loading…
Add table
Reference in a new issue