mirror of
git://git.2f30.org/morpheus.git
synced 2024-06-16 13:38:35 +00:00
Be consistent and use "$var" instead of ${var} or "${var}"
This commit is contained in:
parent
07ebd808c5
commit
30895bba83
@ -12,6 +12,6 @@ build: crossmusl
|
||||
for t in $targets; do
|
||||
cd $t
|
||||
make -j$nprocs CC=$CC
|
||||
cp $t $root/bin/
|
||||
cp $t "$root/bin/"
|
||||
cd ..
|
||||
done
|
||||
|
@ -5,8 +5,8 @@ build: crossmusl
|
||||
cd src/busybox-$v
|
||||
cp $top/stuff/busybox.config .config
|
||||
make -j$nprocs CC=$CC busybox
|
||||
cp busybox "${root}/bin"
|
||||
cd "${root}/bin"
|
||||
cp busybox "$root/bin"
|
||||
cd "$root/bin"
|
||||
ln -sf busybox addgroup
|
||||
ln -sf busybox adduser
|
||||
ln -sf busybox bzip2
|
||||
|
@ -9,6 +9,6 @@ build: prepare_root
|
||||
mv "$root/opt/cross/$arch-linux-musl/$arch-linux-musl/lib64"/* "$root/opt/cross/$arch-linux-musl/$arch-linux-musl/lib"
|
||||
fi
|
||||
for t in ${targets}; do
|
||||
ln -sf ../opt/cross/$arch-linux-musl/bin/$arch-linux-musl-$t $root/bin/$t
|
||||
ln -sf ../opt/cross/$arch-linux-musl/bin/$arch-linux-musl-$t "$root/bin/$t"
|
||||
done
|
||||
ln -sf gcc ${root}/bin/cc
|
||||
ln -sf gcc "$root/bin/cc"
|
||||
|
2
pkgs/dwm
2
pkgs/dwm
@ -9,4 +9,4 @@ build: tinyxlib
|
||||
sed -i "s@LDFLAGS = -s ${LIBS}@LDFLAGS = $LDFLAGS ${LIBS} @" config.mk
|
||||
sed -i "s@CC = cc@CC = $CC@" config.mk
|
||||
make
|
||||
make DESTDIR=${root} install
|
||||
make DESTDIR="$root" install
|
||||
|
2
pkgs/fs
2
pkgs/fs
@ -2,4 +2,4 @@ git="git://git.2f30.org/fs"
|
||||
|
||||
build: prepare_root
|
||||
cd src/fs
|
||||
cp -r * "${root}/"
|
||||
cp -r * "$root/"
|
||||
|
@ -4,13 +4,13 @@ url="$mirror/ncurses.tar.gz"
|
||||
build: crossmusl
|
||||
cd src/ncurses-$v
|
||||
cp $top/stuff/ncurses-fallback.c ncurses/fallback.c
|
||||
CC="$CC -static" ./configure --prefix="${libcroot}" --mandir="$root/share" --without-tests \
|
||||
CC="$CC -static" ./configure --prefix="$libcroot" --mandir="$root/share" --without-tests \
|
||||
--with-normal --enable-sigwinch --disable-nls --without-dlsym \
|
||||
--without-cxx-binding --enable-widec \
|
||||
--with-fallbacks="linux vt100 xterm xterm256-color" </dev/ptmx
|
||||
make -j$nprocs
|
||||
make install
|
||||
cd $root/lib
|
||||
cd "$root/lib"
|
||||
for lib in ncurses form panel menu ; do
|
||||
ln -sf lib${lib}w_g.a lib${lib}_g.a
|
||||
ln -sf lib${lib}w.a lib${lib}.a
|
||||
|
@ -1,12 +1,12 @@
|
||||
build:
|
||||
mkdir -p ${root}
|
||||
cd ${root}
|
||||
mkdir -p "$root"
|
||||
cd "$root"
|
||||
mkdir -p boot bin dev emul etc home mnt opt proc root share src sys tmp var
|
||||
mkdir -p dev/pts dev/shm opt/cross share/doc share/fonts/encodings share/man share/terminfo var/empty var/log var/run
|
||||
rm -f include
|
||||
ln -s opt/cross/${arch}-linux-musl/${arch}-linux-musl/include include
|
||||
ln -s "opt/cross/$arch-linux-musl/$arch-linux-musl/include" include
|
||||
rm -f lib
|
||||
ln -s opt/cross/${arch}-linux-musl/${arch}-linux-musl/lib lib
|
||||
ln -s "opt/cross/$arch-linux-musl/$arch-linux-musl/lib" lib
|
||||
rm -f usr
|
||||
ln -s . usr
|
||||
rm -f sbin
|
||||
|
@ -2,4 +2,4 @@ url="$mirror/syslinux.tar.gz"
|
||||
|
||||
build: prepare_root
|
||||
cd src
|
||||
cp -r syslinux/* $root/
|
||||
cp -r syslinux/* "$root/"
|
||||
|
2
pkgs/vim
2
pkgs/vim
@ -9,4 +9,4 @@ build: ncurses
|
||||
--disable-nls --disable-netbeans
|
||||
make -j$nprocs
|
||||
make DESTDIR="$root" install
|
||||
ln -sf vim $root/bin/vi
|
||||
ln -sf vim "$root/bin/vi"
|
||||
|
Loading…
Reference in New Issue
Block a user