Mercurial > mxe-octave

changeset 724:20bb3a6a9c81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use prefixed pkg-config in package vmime
author Mark Brand <mabrand@mabrand.nl>
date Fri, 12 Feb 2010 15:53:51 +0100
parents 1d0d78bf2dd2
children e269b05413ab
files src/vmime.mk
diffstat 1 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/vmime.mk	Wed Feb 10 12:58:41 2010 +0100
+++ b/src/vmime.mk	Fri Feb 12 15:53:51 2010 +0100
@@ -19,12 +19,18 @@
 endef
 
 define $(PKG)_BUILD
-    # ansi and pedantic are too strict for mingw
+    # The configure script will make the real configuration, but
+    # we need scons to generate configure.in, Makefile.am etc.
+    # ansi and pedantic are too strict for mingw.
     # http://sourceforge.net/tracker/index.php?func=detail&aid=2373234&group_id=2435&atid=102435
     $(SED) "s/'-ansi', //;" -i '$(1)/SConstruct'
     $(SED) "s/'-pedantic', //;" -i '$(1)/SConstruct'
+    $(SED) 's/pkg-config/$(TARGET)-pkg-config/g;' -i '$(1)/SConstruct'
 
-    cd '$(1)' && scons autotools sendmail_path=/sbin/sendmail
+    cd '$(1)' && scons autotools \
+         prefix='$(PREFIX)/$(TARGET)' \
+         target='$(TARGET)' \
+         sendmail_path=/sbin/sendmail
 
     $(SED) 's,libtoolize ,$(LIBTOOLIZE) ,' -i '$(1)'/bootstrap
     cd '$(1)' && ./bootstrap