Mercurial > mxe-octave

diff src/nettle.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 4f9b72cf7ee7
children bcc26ffe9a0f
line wrap: on
line diff
--- a/src/nettle.mk	Sat Jun 01 20:52:09 2013 -0400
+++ b/src/nettle.mk	Sun Jun 02 10:31:04 2013 -0400
@@ -22,15 +22,15 @@
         --host='$(TARGET)' \
         --build="`config.guess`" \
         $(ENABLE_SHARED_OR_STATIC) \
-        --prefix='$(PREFIX)/$(TARGET)'
+        --prefix='$(HOST_PREFIX)'
     $(MAKE) -C '$(1)' -j '$(JOBS)' getopt.o getopt1.o
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
 
-    if [ -d $(PREFIX)/$(TARGET)/lib64 ]; then \
+    if [ -d $(HOST_PREFIX)/lib64 ]; then \
       $(INSTALL) -d $(MXE_LIBDIR)/pkgconfig; \
-      mv $(PREFIX)/$(TARGET)/lib64/pkgconfig/* $(MXE_LIBDIR)/pkgconfig; \
-      rmdir $(PREFIX)/$(TARGET)/lib64/pkgconfig; \
-      mv $(PREFIX)/$(TARGET)/lib64/* $(MXE_LIBDIR); \
+      mv $(HOST_PREFIX)/lib64/pkgconfig/* $(MXE_LIBDIR)/pkgconfig; \
+      rmdir $(HOST_PREFIX)/lib64/pkgconfig; \
+      mv $(HOST_PREFIX)/lib64/* $(MXE_LIBDIR); \
     fi
 endef