Mercurial > mxe-octave
diff src/libpano13.mk @ 3031:951da75fd09c
improve handling of cross tool prefix
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 09 Jun 2013 09:48:08 -0400 |
| parents | b6c7244a2f66 |
| children | 5ef49fb3299d |
line wrap: on
line diff
--- a/src/libpano13.mk Sat Jun 08 20:53:29 2013 -0400 +++ b/src/libpano13.mk Sun Jun 09 09:48:08 2013 -0400 @@ -17,7 +17,7 @@ define $(PKG)_BUILD $(SED) -i 's,WINDOWSX\.H,windowsx.h,' '$(1)/sys_win.h' - $(SED) -i 's,\$${WINDRES-windres},$(TARGET)-windres,' '$(1)/build/win32/compile-resource' + $(SED) -i 's,\$${WINDRES-windres},$(MXE_WINDRES),' '$(1)/build/win32/compile-resource' $(SED) -i 's,m4 -DBUILDNUMBER=\$$buildnumber,$(SED) "s/BUILDNUMBER/\$$buildnumber/g",' '$(1)/build/win32/compile-resource' $(SED) -i 's,\(@HAVE_MINGW_TRUE@am__objects_4 = .*\),\1 ppm.lo,' '$(1)/Makefile.in' $(SED) -i 's,\(@HAVE_MINGW_TRUE@WIN_SRC = .*\),\1 ppm.c,' '$(1)/Makefile.in' @@ -30,6 +30,6 @@ --with-tiff='$(HOST_LIBDIR)' \ --with-png='$(HOST_LIBDIR)' \ --with-zlib='$(HOST_LIBDIR)' \ - LIBS="`'$(TARGET)-pkg-config' --libs libtiff-4`" + LIBS="`'$(MXE_PKG_CONFIG)' --libs libtiff-4`" $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= man_MANS= endef