Mercurial > mxe-octave
diff src/libmng.mk @ 3012:100e618349f7
Improve handling of prefix directories by defining HOST_PREFIX and
BUILD_TOOLS_PREFIX variables in top-level Makefile.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 02 Jun 2013 10:31:04 -0400 |
| parents | 4f9b72cf7ee7 |
| children | bcc26ffe9a0f |
line wrap: on
line diff
--- a/src/libmng.mk Sat Jun 01 20:52:09 2013 -0400 +++ b/src/libmng.mk Sun Jun 02 10:31:04 2013 -0400 @@ -24,13 +24,13 @@ $(CONFIGURE_CPPFLAGS) $(CONFIGURE_LDFLAGS) \ --host='$(TARGET)' \ --build="`config.guess`" \ - --prefix='$(PREFIX)/$(TARGET)' \ + --prefix='$(HOST_PREFIX)' \ --enable-shared $(MAKE) -C '$(1)/.build' -j '$(JOBS)' install - $(SED) -e 's^@prefix@^$(PREFIX)/$(TARGET)^;' \ + $(SED) -e 's^@prefix@^$(HOST_PREFIX)^;' \ -e 's^@VERSION@^$(libmng_VERSION)^;' \ -e 's^@mng_libs_private@^-ljpeg^;' \ -e 's^@mng_requires_private@^lcms zlib^;' \ < '$(1)/libmng.pc.in' > '$(1)/libmng.pc' - $(INSTALL) -m644 '$(1)/libmng.pc' '$(PREFIX)/$(TARGET)/lib/pkgconfig/' + $(INSTALL) -m644 '$(1)/libmng.pc' '$(HOST_PREFIX)/lib/pkgconfig/' endef