Mercurial > mxe-octave

diff src/pcre.mk @ 3012:100e618349f7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 18e1f9937a9c
children bcc26ffe9a0f
line wrap: on
line diff
--- a/src/pcre.mk	Sat Jun 01 20:52:09 2013 -0400
+++ b/src/pcre.mk	Sun Jun 02 10:31:04 2013 -0400
@@ -23,7 +23,7 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         $(ENABLE_SHARED_OR_STATIC) \
-        --prefix='$(PREFIX)/$(TARGET)' \
+        --prefix='$(HOST_PREFIX)' \
         --enable-pcre16 \
         --enable-utf \
         --enable-unicode-properties \
@@ -31,7 +31,7 @@
         --disable-pcregrep-libz \
         --disable-pcregrep-libbz2 \
         --disable-pcretest-libreadline
-    rm -f '$(PREFIX)/$(TARGET)'/share/man/man3/pcre16*.3
+    rm -f '$(HOST_PREFIX)'/share/man/man3/pcre16*.3
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
-    $(INSTALL) -m755 $(PREFIX)/$(TARGET)/bin/pcre-config $(PREFIX)/bin/pcre-config
+    $(INSTALL) -m755 $(HOST_PREFIX)/bin/pcre-config $(BUILD_TOOLS_PREFIX)/bin/pcre-config
 endef