Mercurial > mxe-octave

changeset 131:ed98f6b98e35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use $(1) instead of $(2) to address to temporary build dir
author Volker Grabsch <vog@notjusthosting.com>
date Sat, 08 Nov 2008 19:06:50 +0100
parents d7e4464a369d
children 44c3bd0085e8
files Makefile src/binutils.mk src/gcc.mk src/gettext.mk src/mingwrt.mk src/pdcurses.mk src/pkg_config.mk src/pthreads.mk src/w32api.mk src/zlib.mk
diffstat 10 files changed, 29 insertions(+), 29 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sat Nov 08 18:58:00 2008 +0100
+++ b/Makefile	Sat Nov 08 19:06:50 2008 +0100
@@ -46,7 +46,7 @@
 	    $(call DOWNLOAD,$($(1)_URL),$($(1)_URL_2)) )
 	cd '$(2)' && \
 	    $(call UNPACK_ARCHIVE,$(PKG_DIR)/$($(1)_FILE))
-	$$(call $(1)_BUILD,$(1),$(2)/$($(1)_SUBDIR))
+	$$(call $(1)_BUILD,$(2)/$($(1)_SUBDIR))
 	rm -rfv '$(2)'
 	touch '$$@'
 endef
--- a/src/binutils.mk	Sat Nov 08 18:58:00 2008 +0100
+++ b/src/binutils.mk	Sat Nov 08 19:06:50 2008 +0100
@@ -15,7 +15,7 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(2)' && ./configure \
+    cd '$(1)' && ./configure \
         --target='$(TARGET)' \
         --prefix='$(PREFIX)' \
         --with-gcc \
@@ -23,5 +23,5 @@
         --with-gnu-as \
         --disable-nls \
         --disable-shared
-    $(MAKE) -C '$(2)' all install
+    $(MAKE) -C '$(1)' all install
 endef
--- a/src/gcc.mk	Sat Nov 08 18:58:00 2008 +0100
+++ b/src/gcc.mk	Sat Nov 08 19:06:50 2008 +0100
@@ -15,7 +15,7 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(2)' && ./configure \
+    cd '$(1)' && ./configure \
         --target='$(TARGET)' \
         --prefix='$(PREFIX)' \
         --enable-languages='c,c++' \
@@ -29,5 +29,5 @@
         --enable-threads=win32 \
         --disable-win32-registry \
         --enable-sjlj-exceptions
-    $(MAKE) -C '$(2)' all install
+    $(MAKE) -C '$(1)' all install
 endef
--- a/src/gettext.mk	Sat Nov 08 18:58:00 2008 +0100
+++ b/src/gettext.mk	Sat Nov 08 19:06:50 2008 +0100
@@ -16,10 +16,10 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(2)' && ./configure \
+    cd '$(1)' && ./configure \
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         --enable-threads=win32
-    $(MAKE) -C '$(2)/intl' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)/intl' -j '$(JOBS)' install
 endef
--- a/src/mingwrt.mk	Sat Nov 08 18:58:00 2008 +0100
+++ b/src/mingwrt.mk	Sat Nov 08 19:06:50 2008 +0100
@@ -16,6 +16,6 @@
 
 define $(PKG)_BUILD
     install -d '$(PREFIX)/$(TARGET)'
-    cd '$(2)' && \
+    cd '$(1)' && \
         cp -rpv bin include lib '$(PREFIX)/$(TARGET)'
 endef
--- a/src/pdcurses.mk	Sat Nov 08 18:58:00 2008 +0100
+++ b/src/pdcurses.mk	Sat Nov 08 19:06:50 2008 +0100
@@ -16,18 +16,18 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) 's,copy,cp,' -i '$(2)/win32/mingwin32.mak'
-    $(MAKE) -C '$(2)' -j '$(JOBS)' libs -f '$(2)/win32/mingwin32.mak' \
+    $(SED) 's,copy,cp,' -i '$(1)/win32/mingwin32.mak'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' libs -f '$(1)/win32/mingwin32.mak' \
         CC='$(TARGET)-gcc' \
         LIBEXE='$(TARGET)-ar' \
         DLL=N \
         PDCURSES_SRCDIR=. \
         WIDE=Y \
         UTF8=Y
-    $(TARGET)-ranlib '$(2)/pdcurses.a' '$(2)/panel.a'
+    $(TARGET)-ranlib '$(1)/pdcurses.a' '$(1)/panel.a'
     install -d '$(PREFIX)/$(TARGET)/include/'
-    install -m644 '$(2)/curses.h' '$(2)/panel.h' '$(2)/term.h' '$(PREFIX)/$(TARGET)/include/'
+    install -m644 '$(1)/curses.h' '$(1)/panel.h' '$(1)/term.h' '$(PREFIX)/$(TARGET)/include/'
     install -d '$(PREFIX)/$(TARGET)/lib/'
-    install -m644 '$(2)/pdcurses.a' '$(PREFIX)/$(TARGET)/lib/libpdcurses.a'
-    install -m644 '$(2)/panel.a'    '$(PREFIX)/$(TARGET)/lib/libpanel.a'
+    install -m644 '$(1)/pdcurses.a' '$(PREFIX)/$(TARGET)/lib/libpdcurses.a'
+    install -m644 '$(1)/panel.a'    '$(PREFIX)/$(TARGET)/lib/libpanel.a'
 endef
--- a/src/pkg_config.mk	Sat Nov 08 18:58:00 2008 +0100
+++ b/src/pkg_config.mk	Sat Nov 08 19:06:50 2008 +0100
@@ -15,9 +15,9 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(2)' && ./configure \
+    cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(2)' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
     install -d '$(PREFIX)/$(TARGET)'
     rm -f '$(PREFIX)/bin/$(TARGET)-pkg-config'
     ln -s '../$(TARGET)/bin/pkg-config' '$(PREFIX)/bin/$(TARGET)-pkg-config'
--- a/src/pthreads.mk	Sat Nov 08 18:58:00 2008 +0100
+++ b/src/pthreads.mk	Sat Nov 08 19:06:50 2008 +0100
@@ -16,10 +16,10 @@
 endef
 
 define $(PKG)_BUILD
-    $(SED) '35i\#define PTW32_STATIC_LIB' -i '$(2)/pthread.h'
-    $(MAKE) -C '$(2)' -j '$(JOBS)' GC-static CROSS='$(TARGET)-'
+    $(SED) '35i\#define PTW32_STATIC_LIB' -i '$(1)/pthread.h'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' GC-static CROSS='$(TARGET)-'
     install -d '$(PREFIX)/$(TARGET)/lib'
-    install -m664 '$(2)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a'
+    install -m664 '$(1)/libpthreadGC2.a' '$(PREFIX)/$(TARGET)/lib/libpthread.a'
     install -d '$(PREFIX)/$(TARGET)/include'
-    install -m664 '$(2)/pthread.h' '$(2)/sched.h' '$(2)/semaphore.h' '$(PREFIX)/$(TARGET)/include/'
+    install -m664 '$(1)/pthread.h' '$(1)/sched.h' '$(1)/semaphore.h' '$(PREFIX)/$(TARGET)/include/'
 endef
--- a/src/w32api.mk	Sat Nov 08 18:58:00 2008 +0100
+++ b/src/w32api.mk	Sat Nov 08 19:06:50 2008 +0100
@@ -16,14 +16,14 @@
 
 define $(PKG)_BUILD
     # fix incompatibilities with gettext
-    $(SED) 's,\(SUBLANG_BENGALI_INDIA\t\)0x01,\10x00,'    -i '$(2)/include/winnt.h'
-    $(SED) 's,\(SUBLANG_PUNJABI_INDIA\t\)0x01,\10x00,'    -i '$(2)/include/winnt.h'
-    $(SED) 's,\(SUBLANG_ROMANIAN_ROMANIA\t\)0x01,\10x00,' -i '$(2)/include/winnt.h'
+    $(SED) 's,\(SUBLANG_BENGALI_INDIA\t\)0x01,\10x00,'    -i '$(1)/include/winnt.h'
+    $(SED) 's,\(SUBLANG_PUNJABI_INDIA\t\)0x01,\10x00,'    -i '$(1)/include/winnt.h'
+    $(SED) 's,\(SUBLANG_ROMANIAN_ROMANIA\t\)0x01,\10x00,' -i '$(1)/include/winnt.h'
     # fix incompatibilities with jpeg
-    $(SED) 's,typedef unsigned char boolean;,,'           -i '$(2)/include/rpcndr.h'
+    $(SED) 's,typedef unsigned char boolean;,,'           -i '$(1)/include/rpcndr.h'
     # fix missing definitions for WinPcap and libdnet
-    $(SED) '1i\#include <wtypes.h>'                       -i '$(2)/include/iphlpapi.h'
-    $(SED) '1i\#include <wtypes.h>'                       -i '$(2)/include/wincrypt.h'
+    $(SED) '1i\#include <wtypes.h>'                       -i '$(1)/include/iphlpapi.h'
+    $(SED) '1i\#include <wtypes.h>'                       -i '$(1)/include/wincrypt.h'
     install -d '$(PREFIX)/$(TARGET)'
-    cp -rpv '$(2)/include' '$(2)/lib' '$(PREFIX)/$(TARGET)'
+    cp -rpv '$(1)/include' '$(1)/lib' '$(PREFIX)/$(TARGET)'
 endef
--- a/src/zlib.mk	Sat Nov 08 18:58:00 2008 +0100
+++ b/src/zlib.mk	Sat Nov 08 19:06:50 2008 +0100
@@ -16,7 +16,7 @@
 endef
 
 define $(PKG)_BUILD
-    cd '$(2)' && CC='$(TARGET)-gcc' RANLIB='$(TARGET)-ranlib' ./configure \
+    cd '$(1)' && CC='$(TARGET)-gcc' RANLIB='$(TARGET)-ranlib' ./configure \
         --prefix='$(PREFIX)/$(TARGET)'
-    $(MAKE) -C '$(2)' -j '$(JOBS)' install
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef