Fix various things to use ${DESTDIR}

This commit is contained in:
fosslinux 2022-01-14 21:53:30 +11:00
parent 016b9511d2
commit b8ef19150c
28 changed files with 46 additions and 36 deletions

View File

@ -14,7 +14,7 @@ src_compile() {
} }
src_install() { 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 mkdir -p ${DESTDIR}${PREFIX}/share/autoconf-2.52
cp -r *.m4* ${DESTDIR}${PREFIX}/share/autoconf-2.52/ cp -r *.m4* ${DESTDIR}${PREFIX}/share/autoconf-2.52/
} }

View File

@ -20,7 +20,7 @@ src_install() {
mkdir -p "${DESTDIR}${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/ 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 mkdir -p "${DESTDIR}${PREFIX}"/share/aclocal-1.6
cp -r m4/*.m4 "${DESTDIR}${PREFIX}"/share/aclocal-1.6/ cp -r m4/*.m4 "${DESTDIR}${PREFIX}"/share/aclocal-1.6/
} }

View File

@ -21,11 +21,13 @@ src_compile() {
} }
src_install() { 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/am
mkdir -p "${DESTDIR}${PREFIX}"/share/automake-1.6/Automake
cp lib/Automake/*.pm "${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/ 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/ cp -r m4/*.m4 "${DESTDIR}${PREFIX}"/share/aclocal-1.6/
} }

View File

@ -20,7 +20,7 @@ bison: src.a lib.a
FORCE: FORCE:
install: install:
install bison $(DESTDIR)$(PREFIX)/bin install -D bison $(DESTDIR)$(PREFIX)/bin/bison
rm -rf $(PREFIX)/share/bison rm -rf $(PREFIX)/share/bison
install -d $(DESTDIR)$(PREFIX)/share/bison install -d $(DESTDIR)$(PREFIX)/share/bison
mv data/skeletons/ $(DESTDIR)$(PREFIX)/share/bison mv data/skeletons/ $(DESTDIR)$(PREFIX)/share/bison

View File

@ -16,7 +16,7 @@ src_compile() {
} }
src_install() { 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/bunzip2
ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bzcat ln -sf ${PREFIX}/bin/bzip2 ${DESTDIR}${PREFIX}/bin/bzcat
} }

View File

@ -123,4 +123,5 @@ $(SRC_DIR)/sha1sum: $(SRC_DIR)/sha1sum.o $(SRC_DIR)/md5sum.o $(LIB_DIR)/libfetti
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
install: $(ALL) install: $(ALL)
$(SRC_DIR)/install -d $(bindir)
$(SRC_DIR)/install $^ $(bindir) $(SRC_DIR)/install $^ $(bindir)

View File

@ -111,4 +111,5 @@ $(SRC_DIR)/mktemp: $(SRC_DIR)/mktemp.o $(LIB_DIR)/libfettish.a
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
install: $(ALL) install: $(ALL)
install -d $(bindir)
install $^ $(bindir) install $^ $(bindir)

View File

@ -29,5 +29,5 @@ diff: $(DIFF_OBJECTS)
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
install: all install: all
install cmp $(DESTDIR)$(PREFIX)/bin install -D cmp $(DESTDIR)$(PREFIX)/bin/cmp
install diff $(DESTDIR)$(PREFIX)/bin install diff $(DESTDIR)$(PREFIX)/bin

View File

@ -38,5 +38,5 @@ skel.c: mkskel.sh flex.skl
/bin/sh ./mkskel.sh ./flex.skl > skel.c /bin/sh ./mkskel.sh ./flex.skl > skel.c
install: all install: all
install flex $(DESTDIR)$(PREFIX)/bin install -D flex $(DESTDIR)$(PREFIX)/bin/flex
ln -sf $(PREFIX)/bin/flex $(DESTDIR)$(PREFIX)/bin/lex ln -sf $(PREFIX)/bin/flex $(DESTDIR)$(PREFIX)/bin/lex

View File

@ -41,5 +41,5 @@ skel.c: mkskel.sh flex.skl
/bin/sh ./mkskel.sh . m4 2.6.4 > skel.c /bin/sh ./mkskel.sh . m4 2.6.4 > skel.c
install: all install: all
install flex $(DESTDIR)$(PREFIX)/bin install -D flex $(DESTDIR)$(PREFIX)/bin/flex
ln -sf $(PREFIX)/bin/flex $(DESTDIR)$(PREFIX)/bin/lex ln -sf flex $(DESTDIR)$(PREFIX)/bin/lex

View File

@ -49,5 +49,5 @@ awktab.c: awk.y
bison $^ -o $@ bison $^ -o $@
install: all install: all
install gawk "$(DESTDIR)$(PREFIX)/bin" install -D gawk $(DESTDIR)$(PREFIX)/bin/gawk
ln -s "$(PREFIX)/bin/gawk" "$(DESTDIR)$(PREFIX)/bin/awk" ln -s $(PREFIX)/bin/gawk $(DESTDIR)$(PREFIX)/bin/awk

View File

@ -92,6 +92,6 @@ src_compile() {
} }
src_install() { 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}" make -C build/gcc install STMP_FIXINC= DESTDIR="${DESTDIR}"
} }

View File

@ -87,6 +87,7 @@ src_compile() {
} }
src_install() { 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}" 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 cp gcc/gsyslimits.h ${DESTDIR}${PREFIX}/lib/musl/gcc/i386-unknown-linux-musl/4.0.4/include/syslimits.h
} }

View File

@ -27,6 +27,6 @@ grep: $(GREP_OBJECTS)
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
install: all 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/egrep
ln -sf $(PREFIX)/bin/grep $(DESTDIR)$(PREFIX)/bin/fgrep ln -sf $(PREFIX)/bin/grep $(DESTDIR)$(PREFIX)/bin/fgrep

View File

@ -32,23 +32,23 @@ src_install() {
# We "compile" the headers here because it is easier # We "compile" the headers here because it is easier
for d in include/uapi arch/x86/include/uapi; do for d in include/uapi arch/x86/include/uapi; do
cd "${d}" 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")" headers="$(find . -type f -name "*.h")"
cd "${base_dir}" cd "${base_dir}"
for h in ${headers}; do 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
done done
# Pick-and-choose asm-generic headers # Pick-and-choose asm-generic headers
for i in types ioctl termios termbits ioctls; do 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 done
# Generate asm/unistd_32.h # Generate asm/unistd_32.h
bash arch/x86/entry/syscalls/syscallhdr.sh \ bash arch/x86/entry/syscalls/syscallhdr.sh \
arch/x86/entry/syscalls/syscall_32.tbl \ 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 # Generate linux/version.h
# Rules are from makefile # Rules are from makefile
@ -57,9 +57,9 @@ src_install() {
SUBLEVEL=42 SUBLEVEL=42
VERSION_CODE="$((${VERSION} * 65536 + ${PATCHLEVEL} * 256 + ${SUBLEVEL}))" VERSION_CODE="$((${VERSION} * 65536 + ${PATCHLEVEL} * 256 + ${SUBLEVEL}))"
echo '#define LINUX_VERSION_CODE '"${VERSION_CODE}" \ 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)))' \ 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 # Clear up storage space
cd ../.. cd ../..

View File

@ -44,4 +44,4 @@ lib/config.h:
touch lib/config.h touch lib/config.h
install: all install: all
install src/m4 $(DESTDIR)$(PREFIX)/bin install -D src/m4 $(DESTDIR)$(PREFIX)/bin/m4

View File

@ -63,6 +63,7 @@ src_compile() {
} }
src_install() { src_install() {
mkdir -p "${DESTDIR}${PREFIX}/lib/mes"
install -m 644 libc.a "${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 libgetopt.a "${DESTDIR}${PREFIX}/lib/mes"
install -m 644 crt1.o "${DESTDIR}${PREFIX}/lib/mes" install -m 644 crt1.o "${DESTDIR}${PREFIX}/lib/mes"

View File

@ -15,4 +15,4 @@ miniperl: $(MINIPERL_OBJ)
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
install: all install: all
install miniperl $(DESTDIR)$(PREFIX)/bin/perl install -D miniperl $(DESTDIR)$(PREFIX)/bin/perl

View File

@ -19,6 +19,6 @@ miniperl: $(MINIPERL_OBJ)
$(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@ $(CC) $(CFLAGS) $^ $(LDFLAGS) -o $@
install: all install: all
install miniperl $(DESTDIR)$(PREFIX)/bin/perl install -D miniperl $(DESTDIR)$(PREFIX)/bin/perl
mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)" mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)"
cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)" cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)"

View File

@ -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 $@ $(CC) $(CFLAGS) perlmain.o lib/auto/DynaLoader/DynaLoader.a $(EXTENSIONS_A) lib/auto/POSIX/POSIX.a libperl.a -o $@
install: all install: all
install perl $(DESTDIR)$(PREFIX)/bin/perl install -D perl $(DESTDIR)$(PREFIX)/bin/perl
mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)" mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)"
cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)" cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)"

View File

@ -30,4 +30,4 @@ sed/sed: $(SED_OBJ) libsed.a
$(CC) -o $@ $^ $(CC) -o $@ $^
install: install:
install sed/sed $(DESTDIR)$(PREFIX)/bin install -D sed/sed $(DESTDIR)$(PREFIX)/bin/sed

View File

@ -34,5 +34,5 @@ src_compile() {
} }
src_install() { src_install() {
install tcc ${DESTDIR}${bindir} install -D tcc ${DESTDIR}${bindir}/tcc
} }

View File

@ -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, # 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. # 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} \ ${TCC} \
-v \ -v \
-static \ -static \
-o ${bindir}/tcc-musl \ -o tcc-musl \
-D TCC_TARGET_I386=1 \ -D TCC_TARGET_I386=1 \
-D CONFIG_TCCDIR=\"${libdir}/tcc\" \ -D CONFIG_TCCDIR=\"${libdir}/tcc\" \
-D CONFIG_TCC_CRTPREFIX=\"${libdir}\" \ -D CONFIG_TCC_CRTPREFIX=\"${libdir}\" \
@ -45,5 +45,6 @@ src_install() {
# Remove old tcc binaries # Remove old tcc binaries
rm ${bindir}/tcc rm ${bindir}/tcc
rm ${bindir}/boot*-tcc ${bindir}/tcc-0.9.26 ${bindir}/mes-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
} }

View File

@ -39,6 +39,6 @@ src_compile() {
} }
src_install() { src_install() {
install tcc-musl ${DESTDIR}${bindir} install -D tcc-musl ${DESTDIR}${bindir}/tcc-musl
install -m 644 libtcc1.a ${DESTDIR}${libdir} install -D -m 644 libtcc1.a ${DESTDIR}${libdir}/libtcc1.a
} }

View File

@ -40,6 +40,6 @@ src_compile() {
} }
src_install() { src_install() {
install tcc-musl ${DESTDIR}${bindir} install -D tcc-musl ${DESTDIR}${bindir}/tcc-musl
install -m 644 libtcc1.a ${DESTDIR}${libdir} install -D -m 644 libtcc1.a ${DESTDIR}${libdir}/libtcc1.a
} }

View File

@ -29,7 +29,10 @@ src_configure() {
src_install() { src_install() {
# Do not install prebuilt .mo translation catalogs # Do not install prebuilt .mo translation catalogs
install bash "${DESTDIR}${PREFIX}/bin" install -D bash "${DESTDIR}${PREFIX}/bin/bash"
# Work around weird symlink bug # Work around weird symlink bug
install bash "${DESTDIR}${PREFIX}/bin/sh" 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"
} }

View File

@ -132,6 +132,6 @@ endef
$(foreach f,$(EXTENSIONS),$(eval $(call build_rule,$f))) $(foreach f,$(EXTENSIONS),$(eval $(call build_rule,$f)))
install: all install: all
install perl "$(DESTDIR)$(PREFIX)/bin/perl" install -D perl "$(DESTDIR)$(PREFIX)/bin/perl"
mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)" mkdir -p "$(DESTDIR)$(PRIVLIB_EXP)"
cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)" cp -r lib/* "$(DESTDIR)$(PRIVLIB_EXP)"

View File

@ -15,5 +15,5 @@ src_configure() {
src_install() { src_install() {
default default
rm "${PREFIX}/lib/musl/libxbps.so"* rm "${DESTDIR}${PREFIX}/lib/musl/libxbps.so"*
} }