diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-12-18 18:25:35 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-12-18 18:25:35 -0700 |
| commit | d9982c257463f23be940eea66bd4dc3aadff0043 (patch) | |
| tree | a4744aa4f82b6e9a0a7d019c4112516191aed7c8 /src | |
| parent | 1b97ed2b64bcbcd969124964f1e49837899f1c70 (diff) | |
| parent | b63fc05481bf6d57e6385704ce53c1c19afa9c2e (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makedefs.in | 1 | ||||
| -rw-r--r-- | src/Makefile | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Makedefs.in b/src/Makedefs.in index d4ef28be..a52f96fa 100644 --- a/src/Makedefs.in +++ b/src/Makedefs.in @@ -4,6 +4,7 @@ HAVE_ARM_M0_CC=@HAVE_ARM_M0_CC@ PDCLIB_INCLUDES=@PDCLIB_INCLUDES@ PDCLIB_LIBS_M0=@PDCLIB_LIBS_M0@ PDCLIB_LIBS_M3=@PDCLIB_LIBS_M3@ +PDCLIB_ROOT=@PDCLIB_ROOT@ HAVE_PDCLIB=@HAVE_PDCLIB@ SDCC=@SDCC@ diff --git a/src/Makefile b/src/Makefile index 0ca101c0..392262d4 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,6 +13,7 @@ vpath load_csv.5c kalman vpath matrix.5c kalman include Version +TOPDIR=. include Makedefs SDCCDIRS=\ @@ -114,7 +115,9 @@ clean-local: $(CLEAN_PDCLIB) rm -f altitude.h ao_kalman.h pdclib: - cd ../pdclib && mkdir -p opt/include opt/lib && make && make prefix=`pwd`/opt install + mkdir -p $(PDCLIB_ROOT)/include $(PDCLIB_ROOT)/lib + cd ../pdclib && make && make prefix=`pwd`/../pdclib-root install clean-pdclib: - cd ../pdclib && make clean && rm -rf opt
\ No newline at end of file + rm -rf $(PDCLIB_ROOT) + cd ../pdclib && make clean |