2
0
mirror of https://frontier.innolan.net/github/amigaos-cross-toolchain6.git synced 2024-10-19 10:29:55 +00:00

Don't use '-D' flag for install (GNU extension).

This commit is contained in:
Krystian Bacławski
2014-05-25 21:35:37 +02:00
parent be1a07e721
commit 6e2cca2158
2 changed files with 17 additions and 8 deletions

View File

@ -543,10 +543,13 @@ function build {
ARCH="-m32"
fi
# Take over the path -- to preserve hermetic build.
export PATH="/usr/bin:/bin:/usr/local/bin:/opt/local/bin"
# Make sure we always choose known compiler (from the distro) and not one
# in user's path that could shadow the original one.
CC="$(which gcc)"
CXX="$(which g++)"
CC="$(which gcc) -std=gnu89"
CXX="$(which g++) -std=gnu++98"
# Define extra options for gcc's configure script.
if [ "${VERSION}" != "4" ]; then
@ -564,8 +567,6 @@ function build {
"--disable-shared")
fi
# Take over the path -- to preserve hermetic build.
export PATH="/opt/local/bin:/usr/local/bin:/usr/bin:/bin"
export CC CXX
readonly FLAGS_FOR_TARGET=( \

View File

@ -1,7 +1,15 @@
--- fd2sfd-1.0/Makefile.in.orig 2014-01-02 21:21:41.000000000 +0100
+++ fd2sfd-1.0/Makefile.in 2014-01-02 21:23:12.000000000 +0100
@@ -45,45 +45,6 @@
$(INSTALL_DATA) -D $(srcdir)/cross/share/$${f} $(fd2sfddir)/$${f}; \
--- fd2sfd-1.0/Makefile.in.orig 2003-07-31 08:10:19.000000000 +0200
+++ fd2sfd-1.0/Makefile.in 2014-05-25 20:46:57.000000000 +0200
@@ -40,50 +40,12 @@
# Install tools
$(INSTALL_PROGRAM) $(EXECUTABLE) $(bindir)
- $(INSTALL_PROGRAM) cross/bin/gg-fix-includes $(bindir)
+ $(INSTALL_DATA) cross/bin/gg-fix-includes $(bindir)
for f in `cd $(srcdir)/cross/share/ && find * -type f`; do \
- $(INSTALL_DATA) -D $(srcdir)/cross/share/$${f} $(fd2sfddir)/$${f}; \
+ mkdir -p `dirname $(fd2sfddir)/$${f}`; \
+ $(INSTALL_DATA) $(srcdir)/cross/share/$${f} `dirname $(fd2sfddir)/$${f}`; \
done
- # Install example file structure for FDs