summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--src/binutils.mk4
-rw-r--r--src/gcc.mk4
-rw-r--r--src/gettext.mk4
-rw-r--r--src/mingwrt.mk2
-rw-r--r--src/pdcurses.mk12
-rw-r--r--src/pkg_config.mk4
-rw-r--r--src/pthreads.mk8
-rw-r--r--src/w32api.mk14
-rw-r--r--src/zlib.mk4
10 files changed, 29 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index 3cbb3fc..6ee775e 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ $(PREFIX)/installed.$(1): $(addprefix $(PREFIX)/installed.,$($(1)_DEPS))
$(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
diff --git a/src/binutils.mk b/src/binutils.mk
index 9eeffe6..ca20942 100644
--- a/src/binutils.mk
+++ b/src/binutils.mk
@@ -15,7 +15,7 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
- cd '$(2)' && ./configure \
+ cd '$(1)' && ./configure \
--target='$(TARGET)' \
--prefix='$(PREFIX)' \
--with-gcc \
@@ -23,5 +23,5 @@ define $(PKG)_BUILD
--with-gnu-as \
--disable-nls \
--disable-shared
- $(MAKE) -C '$(2)' all install
+ $(MAKE) -C '$(1)' all install
endef
diff --git a/src/gcc.mk b/src/gcc.mk
index e3bd67a..3bf07b6 100644
--- a/src/gcc.mk
+++ b/src/gcc.mk
@@ -15,7 +15,7 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
- cd '$(2)' && ./configure \
+ cd '$(1)' && ./configure \
--target='$(TARGET)' \
--prefix='$(PREFIX)' \
--enable-languages='c,c++' \
@@ -29,5 +29,5 @@ define $(PKG)_BUILD
--enable-threads=win32 \
--disable-win32-registry \
--enable-sjlj-exceptions
- $(MAKE) -C '$(2)' all install
+ $(MAKE) -C '$(1)' all install
endef
diff --git a/src/gettext.mk b/src/gettext.mk
index dae8509..62dadcb 100644
--- a/src/gettext.mk
+++ b/src/gettext.mk
@@ -16,10 +16,10 @@ define $(PKG)_UPDATE
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
diff --git a/src/mingwrt.mk b/src/mingwrt.mk
index dfd2d1c..dce4a70 100644
--- a/src/mingwrt.mk
+++ b/src/mingwrt.mk
@@ -16,6 +16,6 @@ endef
define $(PKG)_BUILD
install -d '$(PREFIX)/$(TARGET)'
- cd '$(2)' && \
+ cd '$(1)' && \
cp -rpv bin include lib '$(PREFIX)/$(TARGET)'
endef
diff --git a/src/pdcurses.mk b/src/pdcurses.mk
index 65a5bff..685cf99 100644
--- a/src/pdcurses.mk
+++ b/src/pdcurses.mk
@@ -16,18 +16,18 @@ define $(PKG)_UPDATE
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
diff --git a/src/pkg_config.mk b/src/pkg_config.mk
index 26567e7..aa15f99 100644
--- a/src/pkg_config.mk
+++ b/src/pkg_config.mk
@@ -15,9 +15,9 @@ define $(PKG)_UPDATE
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'
diff --git a/src/pthreads.mk b/src/pthreads.mk
index ac3cf28..53cb4ec 100644
--- a/src/pthreads.mk
+++ b/src/pthreads.mk
@@ -16,10 +16,10 @@ define $(PKG)_UPDATE
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
diff --git a/src/w32api.mk b/src/w32api.mk
index 0d02637..1478510 100644
--- a/src/w32api.mk
+++ b/src/w32api.mk
@@ -16,14 +16,14 @@ endef
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
diff --git a/src/zlib.mk b/src/zlib.mk
index 7e3a990..4bebfe9 100644
--- a/src/zlib.mk
+++ b/src/zlib.mk
@@ -16,7 +16,7 @@ define $(PKG)_UPDATE
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
generated by cgit v0.12 at 2024-07-16 03:48:07 (GMT)