logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>
commit: 70d1fc41631aa78b78c10c2204ee0c1d69089952
parent dcec416d0fe1d8d6effdfa985c9bd51995490381
Author: Andrius Štikonas <andrius@stikonas.eu>
Date:   Fri,  2 Apr 2021 12:24:40 +0100

Add support for DESTDIR variable in make install.

Diffstat:

Msysa/autoconf-2.12/autoconf-2.12.sh2+-
Msysa/autoconf-2.13/autoconf-2.13.sh2+-
Msysa/autoconf-2.52/stage1.sh6+++---
Msysa/autoconf-2.52/stage2.sh4++--
Msysa/autoconf-2.53/stage1.sh4++--
Msysa/autoconf-2.53/stage2.sh4++--
Msysa/autoconf-2.54/stage1.sh4++--
Msysa/autoconf-2.54/stage2.sh4++--
Msysa/autoconf-2.55/autoconf-2.55.sh10+++++-----
Msysa/autoconf-2.57/autoconf-2.57.sh10+++++-----
Msysa/autoconf-2.59/autoconf-2.59.sh10+++++-----
Msysa/autoconf-2.61/stage1.sh10+++++-----
Msysa/autoconf-2.61/stage2.sh2+-
Msysa/autoconf-2.65/autoconf-2.65.sh10+++++-----
Msysa/autoconf-2.69/autoconf-2.69.sh10+++++-----
Msysa/automake-1.10.3/automake-1.10.3.sh2+-
Msysa/automake-1.11.2/automake-1.11.2.sh2+-
Msysa/automake-1.12.6/automake-1.12.6.sh2+-
Msysa/automake-1.13.4/automake-1.13.4.sh2+-
Msysa/automake-1.15.1/automake-1.15.1.sh2+-
Msysa/automake-1.4-p6/automake-1.4-p6.sh2+-
Msysa/automake-1.6.3/stage1.sh10+++++-----
Msysa/automake-1.6.3/stage2.sh12++++++------
Msysa/automake-1.6.3/stage3.sh2+-
Msysa/automake-1.7.8/automake-1.7.8.sh2+-
Msysa/automake-1.7/stage1.sh2+-
Msysa/automake-1.7/stage2.sh2+-
Msysa/automake-1.8.5/automake-1.8.5.sh2+-
Msysa/automake-1.9.6/stage1.sh2+-
Msysa/automake-1.9.6/stage2.sh2+-
Msysa/bash-5.1/bash-5.1.sh3++-
Msysa/binutils-2.14/binutils-2.14.sh2+-
Msysa/bison-3.4.1/mk/main.mk8++++----
Msysa/bzip2-1.0.8/bzip2-1.0.8.sh6+++---
Msysa/coreutils-5.0/coreutils-5.0.sh8--------
Msysa/coreutils-5.0/mk/main.mk5+++--
Msysa/coreutils-5.0/mk/pass2.mk4++--
Msysa/coreutils-6.10/coreutils-6.10.sh7-------
Msysa/coreutils-6.10/mk/main.mk2+-
Msysa/diffutils-2.7/mk/main.mk4++--
Msysa/flex-2.5.11/mk/main.mk4++--
Msysa/flex-2.6.4/mk/main.mk4++--
Msysa/gawk-3.0.4/gawk-3.0.4.sh4++--
Msysa/gawk-3.0.4/mk/main.mk4++--
Msysa/gcc-4.0.4/pass1.sh2+-
Msysa/gcc-4.0.4/pass2.sh2+-
Msysa/grep-2.4/mk/main.mk6+++---
Msysa/helpers.sh4++--
Msysa/libtool-1.4/libtool-1.4.sh2+-
Msysa/libtool-2.2.4/libtool-2.2.4.sh2+-
Msysa/m4-1.4.7/mk/main.mk2+-
Msysa/perl-5.000/mk/main.mk2+-
Msysa/perl-5.003/mk/main.mk6+++---
Msysa/perl-5.6.2/mk/main.mk36++++++++++++++++++------------------
Msysa/perl5.004_05/mk/main.mk6+++---
Msysa/perl5.005_03/mk/main.mk6+++---
Msysa/sed-4.0.9/mk/main.mk2+-
Msysa/tcc-0.9.27/tcc-musl-pass1.sh9++++-----
Msysa/tcc-0.9.27/tcc-musl-pass2.sh11+++++------
Msysa/tcc-0.9.27/tcc-musl-pass3.sh11+++++------
60 files changed, 149 insertions(+), 165 deletions(-)

diff --git a/sysa/autoconf-2.12/autoconf-2.12.sh b/sysa/autoconf-2.12/autoconf-2.12.sh @@ -18,5 +18,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/autoconf-2.13/autoconf-2.13.sh b/sysa/autoconf-2.13/autoconf-2.13.sh @@ -18,5 +18,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/autoconf-2.52/stage1.sh b/sysa/autoconf-2.52/stage1.sh @@ -13,7 +13,7 @@ src_compile() { } src_install() { - install autoconf ${PREFIX}/bin/autoconf-2.52 - mkdir -p ${PREFIX}/share/autoconf-2.52 - cp -r *.m4* ${PREFIX}/share/autoconf-2.52/ + install autoconf ${DESTDIR}${PREFIX}/bin/autoconf-2.52 + mkdir -p ${DESTDIR}${PREFIX}/share/autoconf-2.52 + cp -r *.m4* ${DESTDIR}${PREFIX}/share/autoconf-2.52/ } diff --git a/sysa/autoconf-2.52/stage2.sh b/sysa/autoconf-2.52/stage2.sh @@ -19,7 +19,7 @@ src_configure() { } src_compile() { - make MAKEINFO=true + make MAKEINFO=true DESTDIR="${DESTDIR}" } src_install() { @@ -27,5 +27,5 @@ src_install() { rm ${PREFIX}/bin/autoconf-2.52 rm -rf ${PREFIX}/share/autoconf-2.52 - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/autoconf-2.53/stage1.sh b/sysa/autoconf-2.53/stage1.sh @@ -26,9 +26,9 @@ src_configure() { } src_compile() { - make MAKEINFO=true + make MAKEINFO=true DESTDIR="${DESTDIR}" } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/autoconf-2.53/stage2.sh b/sysa/autoconf-2.53/stage2.sh @@ -20,9 +20,9 @@ src_configure() { } src_compile() { - make MAKEINFO=true + make MAKEINFO=true DESTDIR="${DESTDIR}" } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/autoconf-2.54/stage1.sh b/sysa/autoconf-2.54/stage1.sh @@ -28,7 +28,7 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" - ln -sf "${PREFIX}"/bin/autoconf-2.54 "${PREFIX}"/bin/autoconf + ln -sf "${PREFIX}"/bin/autoconf-2.54 "${DESTDIR}${PREFIX}"/bin/autoconf } diff --git a/sysa/autoconf-2.54/stage2.sh b/sysa/autoconf-2.54/stage2.sh @@ -18,9 +18,9 @@ src_configure() { } src_compile() { - make MAKEINFO=true + make MAKEINFO=true DESTDIR="${DESTDIR}" } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/autoconf-2.55/autoconf-2.55.sh b/sysa/autoconf-2.55/autoconf-2.55.sh @@ -22,10 +22,10 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" - ln -sf "${PREFIX}/bin/autoconf-2.55" "${PREFIX}/bin/autoconf" - ln -sf "${PREFIX}/bin/autoheader-2.55" "${PREFIX}/bin/autoheader" - ln -sf "${PREFIX}/bin/autom4te-2.55" "${PREFIX}/bin/autom4te" - ln -sf "${PREFIX}/bin/autoreconf-2.55" "${PREFIX}/bin/autoreconf" + ln -sf "${PREFIX}/bin/autoconf-2.55" "${DESTDIR}${PREFIX}/bin/autoconf" + ln -sf "${PREFIX}/bin/autoheader-2.55" "${DESTDIR}${PREFIX}/bin/autoheader" + ln -sf "${PREFIX}/bin/autom4te-2.55" "${DESTDIR}${PREFIX}/bin/autom4te" + ln -sf "${PREFIX}/bin/autoreconf-2.55" "${DESTDIR}${PREFIX}/bin/autoreconf" } diff --git a/sysa/autoconf-2.57/autoconf-2.57.sh b/sysa/autoconf-2.57/autoconf-2.57.sh @@ -20,10 +20,10 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" - ln -sf "${PREFIX}/bin/autoconf-2.57" "${PREFIX}/bin/autoconf" - ln -sf "${PREFIX}/bin/autoheader-2.57" "${PREFIX}/bin/autoheader" - ln -sf "${PREFIX}/bin/autom4te-2.57" "${PREFIX}/bin/autom4te" - ln -sf "${PREFIX}/bin/autoreconf-2.57" "${PREFIX}/bin/autoreconf" + ln -sf "${PREFIX}/bin/autoconf-2.57" "${DESTDIR}${PREFIX}/bin/autoconf" + ln -sf "${PREFIX}/bin/autoheader-2.57" "${DESTDIR}${PREFIX}/bin/autoheader" + ln -sf "${PREFIX}/bin/autom4te-2.57" "${DESTDIR}${PREFIX}/bin/autom4te" + ln -sf "${PREFIX}/bin/autoreconf-2.57" "${DESTDIR}${PREFIX}/bin/autoreconf" } diff --git a/sysa/autoconf-2.59/autoconf-2.59.sh b/sysa/autoconf-2.59/autoconf-2.59.sh @@ -20,10 +20,10 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" - ln -sf "${PREFIX}/bin/autoconf-2.59" "${PREFIX}/bin/autoconf" - ln -sf "${PREFIX}/bin/autoheader-2.59" "${PREFIX}/bin/autoheader" - ln -sf "${PREFIX}/bin/autom4te-2.59" "${PREFIX}/bin/autom4te" - ln -sf "${PREFIX}/bin/autoreconf-2.59" "${PREFIX}/bin/autoreconf" + ln -sf "${PREFIX}/bin/autoconf-2.59" "${DESTDIR}${PREFIX}/bin/autoconf" + ln -sf "${PREFIX}/bin/autoheader-2.59" "${DESTDIR}${PREFIX}/bin/autoheader" + ln -sf "${PREFIX}/bin/autom4te-2.59" "${DESTDIR}${PREFIX}/bin/autom4te" + ln -sf "${PREFIX}/bin/autoreconf-2.59" "${DESTDIR}${PREFIX}/bin/autoreconf" } diff --git a/sysa/autoconf-2.61/stage1.sh b/sysa/autoconf-2.61/stage1.sh @@ -21,10 +21,10 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" - ln -sf "${PREFIX}/bin/autoconf-2.61" "${PREFIX}/bin/autoconf" - ln -sf "${PREFIX}/bin/autoheader-2.61" "${PREFIX}/bin/autoheader" - ln -sf "${PREFIX}/bin/autom4te-2.61" "${PREFIX}/bin/autom4te" - ln -sf "${PREFIX}/bin/autoreconf-2.61" "${PREFIX}/bin/autoreconf" + ln -sf "${PREFIX}/bin/autoconf-2.61" "${DESTDIR}${PREFIX}/bin/autoconf" + ln -sf "${PREFIX}/bin/autoheader-2.61" "${DESTDIR}${PREFIX}/bin/autoheader" + ln -sf "${PREFIX}/bin/autom4te-2.61" "${DESTDIR}${PREFIX}/bin/autom4te" + ln -sf "${PREFIX}/bin/autoreconf-2.61" "${DESTDIR}${PREFIX}/bin/autoreconf" } diff --git a/sysa/autoconf-2.61/stage2.sh b/sysa/autoconf-2.61/stage2.sh @@ -20,5 +20,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/autoconf-2.65/autoconf-2.65.sh b/sysa/autoconf-2.65/autoconf-2.65.sh @@ -20,10 +20,10 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" - ln -sf "${PREFIX}/bin/autoconf-2.65" "${PREFIX}/bin/autoconf" - ln -sf "${PREFIX}/bin/autoheader-2.65" "${PREFIX}/bin/autoheader" - ln -sf "${PREFIX}/bin/autom4te-2.65" "${PREFIX}/bin/autom4te" - ln -sf "${PREFIX}/bin/autoreconf-2.65" "${PREFIX}/bin/autoreconf" + ln -sf "${PREFIX}/bin/autoconf-2.65" "${DESTDIR}${PREFIX}/bin/autoconf" + ln -sf "${PREFIX}/bin/autoheader-2.65" "${DESTDIR}${PREFIX}/bin/autoheader" + ln -sf "${PREFIX}/bin/autom4te-2.65" "${DESTDIR}${PREFIX}/bin/autom4te" + ln -sf "${PREFIX}/bin/autoreconf-2.65" "${DESTDIR}${PREFIX}/bin/autoreconf" } diff --git a/sysa/autoconf-2.69/autoconf-2.69.sh b/sysa/autoconf-2.69/autoconf-2.69.sh @@ -20,10 +20,10 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" - ln -sf "${PREFIX}/bin/autoconf-2.69" "${PREFIX}/bin/autoconf" - ln -sf "${PREFIX}/bin/autoheader-2.69" "${PREFIX}/bin/autoheader" - ln -sf "${PREFIX}/bin/autom4te-2.69" "${PREFIX}/bin/autom4te" - ln -sf "${PREFIX}/bin/autoreconf-2.69" "${PREFIX}/bin/autoreconf" + ln -sf "${PREFIX}/bin/autoconf-2.69" "${DESTDIR}${PREFIX}/bin/autoconf" + ln -sf "${PREFIX}/bin/autoheader-2.69" "${DESTDIR}${PREFIX}/bin/autoheader" + ln -sf "${PREFIX}/bin/autom4te-2.69" "${DESTDIR}${PREFIX}/bin/autom4te" + ln -sf "${PREFIX}/bin/autoreconf-2.69" "${DESTDIR}${PREFIX}/bin/autoreconf" } diff --git a/sysa/automake-1.10.3/automake-1.10.3.sh b/sysa/automake-1.10.3/automake-1.10.3.sh @@ -17,5 +17,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.11.2/automake-1.11.2.sh b/sysa/automake-1.11.2/automake-1.11.2.sh @@ -17,5 +17,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.12.6/automake-1.12.6.sh b/sysa/automake-1.12.6/automake-1.12.6.sh @@ -17,5 +17,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.13.4/automake-1.13.4.sh b/sysa/automake-1.13.4/automake-1.13.4.sh @@ -17,5 +17,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.15.1/automake-1.15.1.sh b/sysa/automake-1.15.1/automake-1.15.1.sh @@ -17,5 +17,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.4-p6/automake-1.4-p6.sh b/sysa/automake-1.4-p6/automake-1.4-p6.sh @@ -21,5 +21,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.6.3/stage1.sh b/sysa/automake-1.6.3/stage1.sh @@ -17,10 +17,10 @@ src_compile() { } src_install() { - mkdir -p "${PREFIX}"/share/automake-1.6/Automake - cp lib/Automake/*.pm "${PREFIX}"/share/automake-1.6/Automake/ + mkdir -p "${DESTDIR}${PREFIX}"/share/automake-1.6/Automake + cp lib/Automake/*.pm "${DESTDIR}${PREFIX}"/share/automake-1.6/Automake/ - install aclocal "${PREFIX}"/bin/aclocal-1.6 - mkdir -p "${PREFIX}"/share/aclocal-1.6 - cp -r m4/*.m4 "${PREFIX}"/share/aclocal-1.6/ + install aclocal "${DESTDIR}${PREFIX}"/bin/aclocal-1.6 + mkdir -p "${DESTDIR}${PREFIX}"/share/aclocal-1.6 + cp -r m4/*.m4 "${DESTDIR}${PREFIX}"/share/aclocal-1.6/ } diff --git a/sysa/automake-1.6.3/stage2.sh b/sysa/automake-1.6.3/stage2.sh @@ -21,11 +21,11 @@ src_compile() { } src_install() { - install automake "${PREFIX}"/bin/automake-1.6 - mkdir -p "${PREFIX}"/share/automake-1.6/am - cp lib/Automake/*.pm "${PREFIX}"/share/automake-1.6/Automake/ - cp -r lib/am/*.am "${PREFIX}"/share/automake-1.6/am/ + install automake "${DESTDIR}${PREFIX}"/bin/automake-1.6 + mkdir -p "${DESTDIR}${PREFIX}"/share/automake-1.6/am + cp lib/Automake/*.pm "${DESTDIR}${PREFIX}"/share/automake-1.6/Automake/ + cp -r lib/am/*.am "${DESTDIR}${PREFIX}"/share/automake-1.6/am/ - install aclocal "${PREFIX}"/bin/aclocal-1.6 - cp -r m4/*.m4 "${PREFIX}"/share/aclocal-1.6/ + install aclocal "${DESTDIR}${PREFIX}"/bin/aclocal-1.6 + cp -r m4/*.m4 "${DESTDIR}${PREFIX}"/share/aclocal-1.6/ } diff --git a/sysa/automake-1.6.3/stage3.sh b/sysa/automake-1.6.3/stage3.sh @@ -24,5 +24,5 @@ src_install() { rm -rf "${PREFIX}"/share/automake-1.6 rm -rf "${PREFIX}"/share/aclocal-1.6 - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.7.8/automake-1.7.8.sh b/sysa/automake-1.7.8/automake-1.7.8.sh @@ -17,5 +17,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.7/stage1.sh b/sysa/automake-1.7/stage1.sh @@ -19,6 +19,6 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.7/stage2.sh b/sysa/automake-1.7/stage2.sh @@ -17,5 +17,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.8.5/automake-1.8.5.sh b/sysa/automake-1.8.5/automake-1.8.5.sh @@ -15,5 +15,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.9.6/stage1.sh b/sysa/automake-1.9.6/stage1.sh @@ -16,5 +16,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/automake-1.9.6/stage2.sh b/sysa/automake-1.9.6/stage2.sh @@ -15,5 +15,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/bash-5.1/bash-5.1.sh b/sysa/bash-5.1/bash-5.1.sh @@ -25,5 +25,6 @@ src_configure() { } src_install() { - install bash "${PREFIX}/bin" + # Do not install prebuilt .mo translation catalogs + install bash "${DESTDIR}${PREFIX}/bin" } diff --git a/sysa/binutils-2.14/binutils-2.14.sh b/sysa/binutils-2.14/binutils-2.14.sh @@ -130,6 +130,6 @@ src_compile() { src_install() { for dir in libiberty bfd opcodes binutils gas gprof ld; do - make -C $dir install + make -C $dir install DESTDIR=$(DESTDIR) done } diff --git a/sysa/bison-3.4.1/mk/main.mk b/sysa/bison-3.4.1/mk/main.mk @@ -20,8 +20,8 @@ bison: src.a lib.a FORCE: install: - install bison $(PREFIX)/bin + install bison $(DESTDIR)$(PREFIX)/bin rm -rf $(PREFIX)/share/bison - install -d $(PREFIX)/share/bison - mv data/skeletons/ $(PREFIX)/share/bison - mv data/m4sugar/ $(PREFIX)/share/bison + install -d $(DESTDIR)$(PREFIX)/share/bison + mv data/skeletons/ $(DESTDIR)$(PREFIX)/share/bison + mv data/m4sugar/ $(DESTDIR)$(PREFIX)/share/bison diff --git a/sysa/bzip2-1.0.8/bzip2-1.0.8.sh b/sysa/bzip2-1.0.8/bzip2-1.0.8.sh @@ -16,7 +16,7 @@ src_compile() { } src_install() { - install bzip2 ${PREFIX}/bin - ln -sf ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bunzip2 - ln -sf ${PREFIX}/bin/bzip2 ${PREFIX}/bin/bzcat + install bzip2 ${DESTDIR}${PREFIX}/bin + ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bunzip2 + ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bzcat } diff --git a/sysa/coreutils-5.0/coreutils-5.0.sh b/sysa/coreutils-5.0/coreutils-5.0.sh @@ -18,11 +18,3 @@ src_prepare() { cp "${mk_dir}/pass2.mk" Makefile } - -src_compile() { - make -f Makefile -} - -src_install() { - make -f Makefile install PREFIX="${PREFIX}" -} diff --git a/sysa/coreutils-5.0/mk/main.mk b/sysa/coreutils-5.0/mk/main.mk @@ -13,7 +13,8 @@ CC = tcc LD = tcc AR = tcc -ar -bindir=/after/bin +PREFIX=/after +bindir=$(PREFIX)/bin CFLAGS = -I . -I lib \ -DPACKAGE=\"$(PACKAGE)\" \ @@ -40,7 +41,7 @@ CFLAGS = -I . -I lib \ -DTIME_WITH_SYS_TIME=1 \ -DHAVE_STDINT_H=1 \ -DMB_LEN_MAX=16 \ - -DLIBDIR=\"/after/lib\" \ + -DLIBDIR=\"$(PREFIX)/lib\" \ -DHAVE_DECL_WCWIDTH=0 \ -DHAVE_SYS_STAT_H=1 \ -DHAVE_INTTYPES_H=1 \ diff --git a/sysa/coreutils-5.0/mk/pass2.mk b/sysa/coreutils-5.0/mk/pass2.mk @@ -13,7 +13,7 @@ CC = tcc LD = tcc AR = tcc -ar -bindir=/after/bin +bindir = $(DESTDIR)$(PREFIX)/bin CFLAGS = -I . -I lib \ -DPACKAGE=\"$(PACKAGE)\" \ @@ -49,7 +49,7 @@ CFLAGS = -I . -I lib \ -DTIME_WITH_SYS_TIME=1 \ -DHAVE_STDINT_H=1 \ -DMB_LEN_MAX=16 \ - -DLIBDIR=\"/after/lib\" \ + -DLIBDIR=\"$(PREFIX)/lib\" \ -DHAVE_DECL_WCWIDTH=0 \ -DHAVE_SYS_STAT_H=1 \ -DHAVE_INTTYPES_H=1 \ diff --git a/sysa/coreutils-6.10/coreutils-6.10.sh b/sysa/coreutils-6.10/coreutils-6.10.sh @@ -18,10 +18,3 @@ src_prepare() { touch lib/configmake.h } -src_compile() { - make -f Makefile -} - -src_install() { - make -f Makefile install PREFIX="${PREFIX}" -} diff --git a/sysa/coreutils-6.10/mk/main.mk b/sysa/coreutils-6.10/mk/main.mk @@ -13,7 +13,7 @@ CC = tcc LD = tcc AR = tcc -ar -bindir=/after/bin +bindir=$(DESTDIR)$(PREFIX)/bin CFLAGS = -I . -I lib \ -DPACKAGE=\"$(PACKAGE)\" \ diff --git a/sysa/diffutils-2.7/mk/main.mk b/sysa/diffutils-2.7/mk/main.mk @@ -29,5 +29,5 @@ diff: $(DIFF_OBJECTS) $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ install: all - install cmp $(PREFIX)/bin - install diff $(PREFIX)/bin + install cmp $(DESTDIR)$(PREFIX)/bin + install diff $(DESTDIR)$(PREFIX)/bin diff --git a/sysa/flex-2.5.11/mk/main.mk b/sysa/flex-2.5.11/mk/main.mk @@ -38,5 +38,5 @@ skel.c: mkskel.sh flex.skl /bin/sh ./mkskel.sh ./flex.skl > skel.c install: all - install flex $(PREFIX)/bin - ln -sf $(PREFIX)/bin/flex $(PREFIX)/bin/lex + install flex $(DESTDIR)$(PREFIX)/bin + ln -sf $(PREFIX)/bin/flex $(DESTDIR)$(PREFIX)/bin/lex diff --git a/sysa/flex-2.6.4/mk/main.mk b/sysa/flex-2.6.4/mk/main.mk @@ -41,5 +41,5 @@ skel.c: mkskel.sh flex.skl /bin/sh ./mkskel.sh . m4 2.6.4 > skel.c install: all - install flex $(PREFIX)/bin - ln -sf $(PREFIX)/bin/flex $(PREFIX)/bin/lex + install flex $(DESTDIR)$(PREFIX)/bin + ln -sf $(PREFIX)/bin/flex $(DESTDIR)$(PREFIX)/bin/lex diff --git a/sysa/gawk-3.0.4/gawk-3.0.4.sh b/sysa/gawk-3.0.4/gawk-3.0.4.sh @@ -11,8 +11,8 @@ src_install() { default_src_install # Install data files - install -d "${PREFIX}/share/awk/" + install -d "${DESTDIR}${PREFIX}/share/awk/" for file in awklib/eg/lib/*.awk; do - install -m 644 "$file" "${PREFIX}/share/awk/" + install -m 644 "$file" "${DESTDIR}${PREFIX}/share/awk/" done } diff --git a/sysa/gawk-3.0.4/mk/main.mk b/sysa/gawk-3.0.4/mk/main.mk @@ -49,5 +49,5 @@ awktab.c: awk.y bison $^ -o $@ install: all - install gawk "$(PREFIX)/bin" - ln -s "$(PREFIX)/bin/gawk" "$(PREFIX)/bin/awk" + install gawk "$(DESTDIR)$(PREFIX)/bin" + ln -s "$(PREFIX)/bin/gawk" "$(DESTDIR)$(PREFIX)/bin/awk" diff --git a/sysa/gcc-4.0.4/pass1.sh b/sysa/gcc-4.0.4/pass1.sh @@ -92,5 +92,5 @@ src_compile() { src_install() { mkdir -p "${PREFIX}/lib/musl/gcc/i386-unknown-linux-gnu/4.0.4/install-tools/include" - make -C build/gcc install STMP_FIXINC= + make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}" } diff --git a/sysa/gcc-4.0.4/pass2.sh b/sysa/gcc-4.0.4/pass2.sh @@ -87,5 +87,5 @@ src_compile() { } src_install() { - make -C build/gcc install STMP_FIXINC= + make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}" } diff --git a/sysa/grep-2.4/mk/main.mk b/sysa/grep-2.4/mk/main.mk @@ -27,6 +27,6 @@ grep: $(GREP_OBJECTS) $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ install: all - install grep $(PREFIX)/bin - ln -sf $(PREFIX)/bin/grep $(PREFIX)/bin/egrep - ln -sf $(PREFIX)/bin/grep $(PREFIX)/bin/fgrep + install grep $(DESTDIR)$(PREFIX)/bin + ln -sf $(PREFIX)/bin/grep $(DESTDIR)$(PREFIX)/bin/egrep + ln -sf $(PREFIX)/bin/grep $(DESTDIR)$(PREFIX)/bin/fgrep diff --git a/sysa/helpers.sh b/sysa/helpers.sh @@ -111,13 +111,13 @@ default_src_configure() { # Default function for compiling source. It simply runs make without any parameters. default_src_compile() { - make -f Makefile + make -f Makefile PREFIX="${PREFIX}" } # Default installing function. PREFIX should be set by run.sh script. # Note that upstream makefiles might ignore PREFIX and have to be configured in configure stage. default_src_install() { - make -f Makefile install PREFIX="${PREFIX}" + make -f Makefile install PREFIX="${PREFIX}" DESTDIR="${DESTDIR}" } # Check if bash function exists diff --git a/sysa/libtool-1.4/libtool-1.4.sh b/sysa/libtool-1.4/libtool-1.4.sh @@ -19,5 +19,5 @@ src_configure() { } src_compile() { - AR="tcc -ar" AR_FLAGS="cr" make + AR="tcc -ar" AR_FLAGS="cr" make DESTDIR="${DESTDIR}" } diff --git a/sysa/libtool-2.2.4/libtool-2.2.4.sh b/sysa/libtool-2.2.4/libtool-2.2.4.sh @@ -21,5 +21,5 @@ src_compile() { } src_install() { - make install MAKEINFO=true + make install MAKEINFO=true DESTDIR="${DESTDIR}" } diff --git a/sysa/m4-1.4.7/mk/main.mk b/sysa/m4-1.4.7/mk/main.mk @@ -44,4 +44,4 @@ lib/config.h: touch lib/config.h install: all - install src/m4 $(PREFIX)/bin + install src/m4 $(DESTDIR)$(PREFIX)/bin diff --git a/sysa/perl-5.000/mk/main.mk b/sysa/perl-5.000/mk/main.mk @@ -15,4 +15,4 @@ miniperl: $(MINIPERL_OBJ) $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ install: all - install miniperl $(PREFIX)/bin/perl + install miniperl $(DESTDIR)$(PREFIX)/bin/perl diff --git a/sysa/perl-5.003/mk/main.mk b/sysa/perl-5.003/mk/main.mk @@ -19,6 +19,6 @@ miniperl: $(MINIPERL_OBJ) $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ install: all - install miniperl $(PREFIX)/bin/perl - mkdir -p "$(PRIVLIB_EXP)" - cp -r lib/* "$(PRIVLIB_EXP)" + install miniperl $(DESTDIR)$(PREFIX)/bin/perl + mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)" + cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)" diff --git a/sysa/perl-5.6.2/mk/main.mk b/sysa/perl-5.6.2/mk/main.mk @@ -115,21 +115,21 @@ perl: perlmain.o lib/auto/DynaLoader/DynaLoader.a $(EXTENSIONS_A) lib/auto/POSIX $(CC) $(CFLAGS) perlmain.o lib/auto/DynaLoader/DynaLoader.a $(EXTENSIONS_A) lib/auto/POSIX/POSIX.a libperl.a -o $@ install: all - install perl $(PREFIX)/bin/perl - mkdir -p "$(PRIVLIB_EXP)" - cp -r lib/* "$(PRIVLIB_EXP)" - - install -m 644 ext/DynaLoader/XSLoader.pm "$(PRIVLIB_EXP)" - install -m 644 ext/DynaLoader/DynaLoader.pm "$(PRIVLIB_EXP)" - - install -m 644 ext/ByteLoader/ByteLoader.pm "$(PRIVLIB_EXP)" - mkdir "$(PRIVLIB_EXP)/Data/" - install -m 644 ext/Data/Dumper/Dumper.pm "$(PRIVLIB_EXP)/Data/" - install -m 644 ext/Fcntl/Fcntl.pm "$(PRIVLIB_EXP)" - install -m 644 ext/File/Glob/Glob.pm "$(PRIVLIB_EXP)/File/" - install -m 644 ext/IO/IO.pm "$(PRIVLIB_EXP)" - mkdir "$(PRIVLIB_EXP)/IO/" - cp ext/IO/lib/IO/*.pm "$(PRIVLIB_EXP)/IO/" - install -m 644 ext/POSIX/POSIX.pm "$(PRIVLIB_EXP)/" - install -m 644 ext/POSIX/POSIX.pod "$(PRIVLIB_EXP)/" - cp lib/auto/POSIX/* "$(PRIVLIB_EXP)/auto/POSIX/" + install perl $(DESTDIR)$(PREFIX)/bin/perl + mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)" + cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)" + + install -m 644 ext/DynaLoader/XSLoader.pm "$(DESTDIR)$(PRIVLIB_EXP)" + install -m 644 ext/DynaLoader/DynaLoader.pm "$(DESTDIR)$(PRIVLIB_EXP)" + + install -m 644 ext/ByteLoader/ByteLoader.pm "$(DESTDIR)$(PRIVLIB_EXP)" + mkdir "$(DESTDIR)$(PRIVLIB_EXP)/Data/" + install -m 644 ext/Data/Dumper/Dumper.pm "$(DESTDIR)$(PRIVLIB_EXP)/Data/" + install -m 644 ext/Fcntl/Fcntl.pm "$(DESTDIR)$(PRIVLIB_EXP)" + install -m 644 ext/File/Glob/Glob.pm "$(DESTDIR)$(PRIVLIB_EXP)/File/" + install -m 644 ext/IO/IO.pm "$(DESTDIR)$(PRIVLIB_EXP)" + mkdir "$(DESTDIR)$(PRIVLIB_EXP)/IO/" + cp ext/IO/lib/IO/*.pm "$(DESTDIR)$(PRIVLIB_EXP)/IO/" + install -m 644 ext/POSIX/POSIX.pm "$(DESTDIR)$(PRIVLIB_EXP)/" + install -m 644 ext/POSIX/POSIX.pod "$(DESTDIR)$(PRIVLIB_EXP)/" + cp lib/auto/POSIX/* "$(DESTDIR)$(PRIVLIB_EXP)/auto/POSIX/" diff --git a/sysa/perl5.004_05/mk/main.mk b/sysa/perl5.004_05/mk/main.mk @@ -19,6 +19,6 @@ miniperl: $(MINIPERL_OBJ) $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ install: all - install miniperl $(PREFIX)/bin/perl - mkdir -p "$(PRIVLIB_EXP)" - cp -r lib/* "$(PRIVLIB_EXP)" + install miniperl $(DESTDIR)$(PREFIX)/bin/perl + mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)" + cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)" diff --git a/sysa/perl5.005_03/mk/main.mk b/sysa/perl5.005_03/mk/main.mk @@ -19,6 +19,6 @@ miniperl: $(MINIPERL_OBJ) $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ install: all - install miniperl $(PREFIX)/bin/perl - mkdir -p "$(PRIVLIB_EXP)" - cp -r lib/* "$(PRIVLIB_EXP)" + install miniperl $(DESTDIR)$(PREFIX)/bin/perl + mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)" + cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)" diff --git a/sysa/sed-4.0.9/mk/main.mk b/sysa/sed-4.0.9/mk/main.mk @@ -30,4 +30,4 @@ sed/sed: $(SED_OBJ) libsed.a $(CC) -o $@ $^ install: - install sed/sed $(PREFIX)/bin + install sed/sed $(DESTDIR)$(PREFIX)/bin diff --git a/sysa/tcc-0.9.27/tcc-musl-pass1.sh b/sysa/tcc-0.9.27/tcc-musl-pass1.sh @@ -13,10 +13,9 @@ src_prepare() { } src_compile() { - export prefix=/after - export libdir=${prefix}/lib/musl - export incdir=${prefix}/include/musl - export bindir=${prefix}/bin + export libdir=${PREFIX}/lib/musl + export incdir=${PREFIX}/include/musl + export bindir=${PREFIX}/bin mkdir -p ${libdir}/tcc @@ -50,5 +49,5 @@ src_install() { # Remove old tcc binaries rm ${bindir}/tcc rm ${bindir}/boot*-tcc ${bindir}/tcc-0.9.26 ${bindir}/mes-tcc - ln -s ${bindir}/tcc-musl ${bindir}/tcc + ln -s ${bindir}/tcc-musl ${DESTDIR}${bindir}/tcc } diff --git a/sysa/tcc-0.9.27/tcc-musl-pass2.sh b/sysa/tcc-0.9.27/tcc-musl-pass2.sh @@ -15,10 +15,9 @@ src_prepare() { } src_compile() { - export prefix=/after - export libdir=${prefix}/lib/musl - export incdir=${prefix}/include/musl - export bindir=${prefix}/bin + export libdir=${PREFIX}/lib/musl + export incdir=${PREFIX}/include/musl + export bindir=${PREFIX}/bin mkdir -p ${libdir}/tcc @@ -45,6 +44,6 @@ src_compile() { } src_install() { - install tcc-musl ${bindir} - install -m 644 libtcc1.a ${libdir} + install tcc-musl ${DESTDIR}${bindir} + install -m 644 libtcc1.a ${DESTDIR}${libdir} } diff --git a/sysa/tcc-0.9.27/tcc-musl-pass3.sh b/sysa/tcc-0.9.27/tcc-musl-pass3.sh @@ -15,10 +15,9 @@ src_prepare() { } src_compile() { - export prefix=/after - export libdir=${prefix}/lib/musl - export incdir=${prefix}/include - export bindir=${prefix}/bin + export libdir=${PREFIX}/lib/musl + export incdir=${PREFIX}/include + export bindir=${PREFIX}/bin mkdir -p ${libdir}/tcc @@ -46,6 +45,6 @@ src_compile() { } src_install() { - install tcc-musl ${bindir} - install -m 644 libtcc1.a ${libdir} + install tcc-musl $(DESTDIR)${bindir} + install -m 644 libtcc1.a $(DESTDIR)${libdir} }