build-mingw-w64: Fix installing COPYING files on macOS
The install(1) tool on macOS doesn't support the -D option for creating directories at the same time while installing files. Therefore, run a separate step for creating directories. Doing that with "mkdir -p", even if install(1) also could do that with the -d option (likewise with a separate command). Also stop specifying the destination file name, when it's equal to the source files, now that we know that the destination directory already exists.
This commit is contained in:
1 parent
192a734b71
commit
83d84ab79b
3 files changed
+8
-4
No files matched your search
@@ -47,7 +47,8 @@ for lib in winpthreads winstorecompat; do
|
|||||||
make -j$CORES
|
make -j$CORES
|
||||||
make install
|
make install
|
||||||
cd ..
|
cd ..
|
||||||
install -Dm644 COPYING "$arch_prefix/share/mingw32/COPYING.${lib}.txt"
|
mkdir -p "$arch_prefix/share/mingw32"
|
||||||
|
install -m644 COPYING "$arch_prefix/share/mingw32/COPYING.${lib}.txt"
|
||||||
done
|
done
|
||||||
cd ..
|
cd ..
|
||||||
done
|
done
|
||||||
@@ -92,7 +92,8 @@ cd build${CROSS_NAME}
|
|||||||
../configure --prefix="$PREFIX" $CONFIGFLAGS
|
../configure --prefix="$PREFIX" $CONFIGFLAGS
|
||||||
$MAKE -j$CORES
|
$MAKE -j$CORES
|
||||||
$MAKE install-strip
|
$MAKE install-strip
|
||||||
install -Dm644 ../COPYING "$PREFIX/share/gendef/COPYING"
|
mkdir -p "$PREFIX/share/gendef"
|
||||||
|
install -m644 ../COPYING "$PREFIX/share/gendef"
|
||||||
cd ../../widl
|
cd ../../widl
|
||||||
[ -z "$CLEAN" ] || rm -rf build${CROSS_NAME}
|
[ -z "$CLEAN" ] || rm -rf build${CROSS_NAME}
|
||||||
mkdir -p build${CROSS_NAME}
|
mkdir -p build${CROSS_NAME}
|
||||||
@@ -100,7 +101,8 @@ cd build${CROSS_NAME}
|
|||||||
../configure --prefix="$PREFIX" --target=$ANY_ARCH-w64-mingw32 --with-widl-includedir="$INCLUDEDIR" $CONFIGFLAGS
|
../configure --prefix="$PREFIX" --target=$ANY_ARCH-w64-mingw32 --with-widl-includedir="$INCLUDEDIR" $CONFIGFLAGS
|
||||||
$MAKE -j$CORES
|
$MAKE -j$CORES
|
||||||
$MAKE install-strip
|
$MAKE install-strip
|
||||||
install -Dm644 ../../../COPYING "$PREFIX/share/widl/COPYING"
|
mkdir -p "$PREFIX/share/widl"
|
||||||
|
install -m644 ../../../COPYING "$PREFIX/share/widl"
|
||||||
cd ..
|
cd ..
|
||||||
cd "$PREFIX/bin"
|
cd "$PREFIX/bin"
|
||||||
# The build above produced $ANY_ARCH-w64-mingw32-widl, add symlinks to it
|
# The build above produced $ANY_ARCH-w64-mingw32-widl, add symlinks to it
|
||||||
|
|||||||
+2
-1
@@ -126,7 +126,8 @@ done
|
|||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
for arch in $ARCHS; do
|
for arch in $ARCHS; do
|
||||||
|
mkdir -p "$PREFIX/$arch-w64-mingw32/share/mingw32"
|
||||||
for file in COPYING COPYING.MinGW-w64/COPYING.MinGW-w64.txt COPYING.MinGW-w64-runtime/COPYING.MinGW-w64-runtime.txt; do
|
for file in COPYING COPYING.MinGW-w64/COPYING.MinGW-w64.txt COPYING.MinGW-w64-runtime/COPYING.MinGW-w64-runtime.txt; do
|
||||||
install -Dm644 "$file" "$PREFIX/$arch-w64-mingw32/share/mingw32/$(basename "$file")"
|
install -m644 "$file" "$PREFIX/$arch-w64-mingw32/share/mingw32"
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
Reference in new issue
Block a user