commit: b8ef19150c774029840fb58820f8eb00d822d649
parent 016b9511d2fd6bac25a42ea15c298451a6daad30
Author: fosslinux <fosslinux@aussies.space>
Date: Fri, 14 Jan 2022 21:53:30 +1100
Fix various things to use ${DESTDIR}
Diffstat:
28 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/sysa/autoconf-2.52/stage1.sh b/sysa/autoconf-2.52/stage1.sh
@@ -14,7 +14,7 @@ src_compile() {
}
src_install() {
- install autoconf ${DESTDIR}${PREFIX}/bin/autoconf-2.52
+ install -D 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/automake-1.6.3/stage1.sh b/sysa/automake-1.6.3/stage1.sh
@@ -20,7 +20,7 @@ src_install() {
mkdir -p "${DESTDIR}${PREFIX}"/share/automake-1.6/Automake
cp lib/Automake/*.pm "${DESTDIR}${PREFIX}"/share/automake-1.6/Automake/
- install aclocal "${DESTDIR}${PREFIX}"/bin/aclocal-1.6
+ install -D 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,13 @@ src_compile() {
}
src_install() {
- install automake "${DESTDIR}${PREFIX}"/bin/automake-1.6
+ install -D automake "${DESTDIR}${PREFIX}"/bin/automake-1.6
mkdir -p "${DESTDIR}${PREFIX}"/share/automake-1.6/am
+ mkdir -p "${DESTDIR}${PREFIX}"/share/automake-1.6/Automake
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 "${DESTDIR}${PREFIX}"/bin/aclocal-1.6
+ install -D 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/bison-3.4.1/mk/main.mk b/sysa/bison-3.4.1/mk/main.mk
@@ -20,7 +20,7 @@ bison: src.a lib.a
FORCE:
install:
- install bison $(DESTDIR)$(PREFIX)/bin
+ install -D bison $(DESTDIR)$(PREFIX)/bin/bison
rm -rf $(PREFIX)/share/bison
install -d $(DESTDIR)$(PREFIX)/share/bison
mv data/skeletons/ $(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 ${DESTDIR}${PREFIX}/bin
+ install -D bzip2 ${DESTDIR}${PREFIX}/bin/bzip2
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/mk/pass2.mk b/sysa/coreutils-5.0/mk/pass2.mk
@@ -123,4 +123,5 @@ $(SRC_DIR)/sha1sum: $(SRC_DIR)/sha1sum.o $(SRC_DIR)/md5sum.o $(LIB_DIR)/libfetti
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
install: $(ALL)
+ $(SRC_DIR)/install -d $(bindir)
$(SRC_DIR)/install $^ $(bindir)
diff --git a/sysa/coreutils-6.10/mk/main.mk b/sysa/coreutils-6.10/mk/main.mk
@@ -111,4 +111,5 @@ $(SRC_DIR)/mktemp: $(SRC_DIR)/mktemp.o $(LIB_DIR)/libfettish.a
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
install: $(ALL)
+ install -d $(bindir)
install $^ $(bindir)
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 $(DESTDIR)$(PREFIX)/bin
+ install -D cmp $(DESTDIR)$(PREFIX)/bin/cmp
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 $(DESTDIR)$(PREFIX)/bin
+ install -D flex $(DESTDIR)$(PREFIX)/bin/flex
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 $(DESTDIR)$(PREFIX)/bin
- ln -sf $(PREFIX)/bin/flex $(DESTDIR)$(PREFIX)/bin/lex
+ install -D flex $(DESTDIR)$(PREFIX)/bin/flex
+ ln -sf flex $(DESTDIR)$(PREFIX)/bin/lex
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 "$(DESTDIR)$(PREFIX)/bin"
- ln -s "$(PREFIX)/bin/gawk" "$(DESTDIR)$(PREFIX)/bin/awk"
+ install -D gawk $(DESTDIR)$(PREFIX)/bin/gawk
+ 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,6 +92,6 @@ src_compile() {
}
src_install() {
- mkdir -p "${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/install-tools/include"
+ mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/install-tools/include"
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,6 +87,7 @@ src_compile() {
}
src_install() {
+ mkdir -p "${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/install-tools/include"
make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}"
cp gcc/gsyslimits.h ${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h
}
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 $(DESTDIR)$(PREFIX)/bin
+ install -D grep $(DESTDIR)$(PREFIX)/bin/grep
ln -sf $(PREFIX)/bin/grep $(DESTDIR)$(PREFIX)/bin/egrep
ln -sf $(PREFIX)/bin/grep $(DESTDIR)$(PREFIX)/bin/fgrep
diff --git a/sysa/linux-headers-5.10.41/linux-headers-5.10.41.sh b/sysa/linux-headers-5.10.41/linux-headers-5.10.41.sh
@@ -32,23 +32,23 @@ src_install() {
# We "compile" the headers here because it is easier
for d in include/uapi arch/x86/include/uapi; do
cd "${d}"
- find . -type d -exec mkdir "${PREFIX}/include/{}" -p \;
+ find . -type d -exec mkdir "${DESTDIR}${PREFIX}/include/{}" -p \;
headers="$(find . -type f -name "*.h")"
cd "${base_dir}"
for h in ${headers}; do
- scripts/headers_install.sh "${d}/${h}" "${PREFIX}/include/${h}"
+ scripts/headers_install.sh "${d}/${h}" "${DESTDIR}${PREFIX}/include/${h}"
done
done
# Pick-and-choose asm-generic headers
for i in types ioctl termios termbits ioctls; do
- cp ${PREFIX}/include/asm-generic/${i}.h ${PREFIX}/include/asm/${i}.h
+ cp "${DESTDIR}${PREFIX}/include/asm-generic/${i}.h" "${DESTDIR}${PREFIX}/include/asm/${i}.h"
done
# Generate asm/unistd_32.h
bash arch/x86/entry/syscalls/syscallhdr.sh \
arch/x86/entry/syscalls/syscall_32.tbl \
- ${PREFIX}/include/asm/unistd_32.h i386
+ "${DESTDIR}${PREFIX}/include/asm/unistd_32.h" i386
# Generate linux/version.h
# Rules are from makefile
@@ -57,9 +57,9 @@ src_install() {
SUBLEVEL=42
VERSION_CODE="$((${VERSION} * 65536 + ${PATCHLEVEL} * 256 + ${SUBLEVEL}))"
echo '#define LINUX_VERSION_CODE '"${VERSION_CODE}" \
- > ${PREFIX}/include/linux/version.h
+ > "${DESTDIR}${PREFIX}/include/linux/version.h"
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + ((c) > 255 ? 255 : (c)))' \
- >> ${PREFIX}/include/linux/version.h
+ >> "${DESTDIR}${PREFIX}/include/linux/version.h"
# Clear up storage space
cd ../..
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 $(DESTDIR)$(PREFIX)/bin
+ install -D src/m4 $(DESTDIR)$(PREFIX)/bin/m4
diff --git a/sysa/mes-0.23/mes-libc-0.23.sh b/sysa/mes-0.23/mes-libc-0.23.sh
@@ -63,6 +63,7 @@ src_compile() {
}
src_install() {
+ mkdir -p "${DESTDIR}${PREFIX}/lib/mes"
install -m 644 libc.a "${DESTDIR}${PREFIX}/lib/mes"
install -m 644 libgetopt.a "${DESTDIR}${PREFIX}/lib/mes"
install -m 644 crt1.o "${DESTDIR}${PREFIX}/lib/mes"
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 $(DESTDIR)$(PREFIX)/bin/perl
+ install -D 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 $(DESTDIR)$(PREFIX)/bin/perl
+ install -D 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,7 +115,7 @@ 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 $(DESTDIR)$(PREFIX)/bin/perl
+ install -D perl $(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 $(DESTDIR)$(PREFIX)/bin
+ install -D sed/sed $(DESTDIR)$(PREFIX)/bin/sed
diff --git a/sysa/tcc-0.9.27/tcc-meslibc-rebuild.sh b/sysa/tcc-0.9.27/tcc-meslibc-rebuild.sh
@@ -34,5 +34,5 @@ src_compile() {
}
src_install() {
- install tcc ${DESTDIR}${bindir}
+ install -D tcc ${DESTDIR}${bindir}/tcc
}
diff --git a/sysa/tcc-0.9.27/tcc-musl-pass1.sh b/sysa/tcc-0.9.27/tcc-musl-pass1.sh
@@ -17,11 +17,11 @@ src_compile() {
# We first have to recompile using tcc-0.9.26 as tcc-0.9.27 is not self-hosting,
# but when linked with musl it is.
- for TCC in tcc-0.9.26 tcc-musl; do
+ for TCC in tcc-0.9.26 ./tcc-musl; do
${TCC} \
-v \
-static \
- -o ${bindir}/tcc-musl \
+ -o tcc-musl \
-D TCC_TARGET_I386=1 \
-D CONFIG_TCCDIR=\"${libdir}/tcc\" \
-D CONFIG_TCC_CRTPREFIX=\"${libdir}\" \
@@ -45,5 +45,6 @@ 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 ${DESTDIR}${bindir}/tcc
+ install -D tcc-musl ${DESTDIR}${bindir}/tcc-musl
+ ln -s 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
@@ -39,6 +39,6 @@ src_compile() {
}
src_install() {
- install tcc-musl ${DESTDIR}${bindir}
- install -m 644 libtcc1.a ${DESTDIR}${libdir}
+ install -D tcc-musl ${DESTDIR}${bindir}/tcc-musl
+ install -D -m 644 libtcc1.a ${DESTDIR}${libdir}/libtcc1.a
}
diff --git a/sysa/tcc-0.9.27/tcc-musl-pass3.sh b/sysa/tcc-0.9.27/tcc-musl-pass3.sh
@@ -40,6 +40,6 @@ src_compile() {
}
src_install() {
- install tcc-musl ${DESTDIR}${bindir}
- install -m 644 libtcc1.a ${DESTDIR}${libdir}
+ install -D tcc-musl ${DESTDIR}${bindir}/tcc-musl
+ install -D -m 644 libtcc1.a ${DESTDIR}${libdir}/libtcc1.a
}
diff --git a/sysc/bash-5.1/bash-5.1.sh b/sysc/bash-5.1/bash-5.1.sh
@@ -29,7 +29,10 @@ src_configure() {
src_install() {
# Do not install prebuilt .mo translation catalogs
- install bash "${DESTDIR}${PREFIX}/bin"
+ install -D bash "${DESTDIR}${PREFIX}/bin/bash"
# Work around weird symlink bug
install bash "${DESTDIR}${PREFIX}/bin/sh"
+
+ # Needs special handling b/c is currently running - tar doesn't like this
+ rm -f "${PREFIX}/bin/bash" "${PREFIX}/bin/sh"
}
diff --git a/sysc/perl-5.10.1/mk/main.mk b/sysc/perl-5.10.1/mk/main.mk
@@ -132,6 +132,6 @@ endef
$(foreach f,$(EXTENSIONS),$(eval $(call build_rule,$f)))
install: all
- install perl "$(DESTDIR)$(PREFIX)/bin/perl"
+ install -D perl "$(DESTDIR)$(PREFIX)/bin/perl"
mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)"
cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)"
diff --git a/sysc/xbps-0.59.1/xbps-0.59.1.sh b/sysc/xbps-0.59.1/xbps-0.59.1.sh
@@ -15,5 +15,5 @@ src_configure() {
src_install() {
default
- rm "${PREFIX}/lib/musl/libxbps.so"*
+ rm "${DESTDIR}${PREFIX}/lib/musl/libxbps.so"*
}
