diff options
| author | Serge van den Boom <svdb@stack.nl> | 2009-01-28 20:43:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-28 21:30:20 (GMT) |
| commit | 85b4518f44b1950918c80c32d1ede4731cb78b76 (patch) | |
| tree | ba471d28291daa4937e36a2444745c158ec5938d /Makefile | |
| parent | 98ef23b3b106ef8cf4dc0db34e62a39e044cf99b (diff) | |
| download | git-85b4518f44b1950918c80c32d1ede4731cb78b76.zip git-85b4518f44b1950918c80c32d1ede4731cb78b76.tar.gz git-85b4518f44b1950918c80c32d1ede4731cb78b76.tar.bz2 | |
Makefile: Make 'configure --with-expat=path' actually work
While the configure script sets the EXPATDIR environment variable to
whatever value was passed to its option --with-expat as the prefix of
the location of the expat library and headers, the Makefile ignored it.
This patch fixes this bug.
Signed-off-by: Serge van den Boom <svdb@stack.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -23,6 +23,9 @@ all:: # Define NO_EXPAT if you do not have expat installed. git-http-push is # not built, and you cannot push using http:// and https:// transports. # +# Define EXPATDIR=/foo/bar if your expat header and library files are in +# /foo/bar/include and /foo/bar/lib directories. +# # Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent. # # Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks @@ -850,7 +853,12 @@ else endif endif ifndef NO_EXPAT - EXPAT_LIBEXPAT = -lexpat + ifdef EXPATDIR + BASIC_CFLAGS += -I$(EXPATDIR)/include + EXPAT_LIBEXPAT = -L$(EXPATDIR)/$(lib) $(CC_LD_DYNPATH)$(EXPATDIR)/$(lib) -lexpat + else + EXPAT_LIBEXPAT = -lexpat + endif endif endif |