diff --git a/.gitignore b/.gitignore index 090230c9..8826fb66 100644 --- a/.gitignore +++ b/.gitignore @@ -147,7 +147,7 @@ /install.sh /uninstall.sh /mes/module/mes/boot-0.scm -/scripts/ar +/scripts/mesar /scripts/mescc.scm /scripts/mescc /doc/images/gcc-mesboot-graph.png diff --git a/build-aux/build.sh.in b/build-aux/build.sh.in index d765f2a5..148386ac 100644 --- a/build-aux/build.sh.in +++ b/build-aux/build.sh.in @@ -142,7 +142,7 @@ fi -I ${srcdest}include/$mes_kernel/$mes_cpu " compiler=mescc - AR="${srcdest}pre-inst-env ar" + AR="${srcdest}pre-inst-env mesar" CC="${srcdest}pre-inst-env mescc -m $mes_bits" ${SHELL} ${srcdest}build-aux/build-lib.sh ) diff --git a/build-aux/check.sh.in b/build-aux/check.sh.in index 69539cbe..c01c92f2 100644 --- a/build-aux/check.sh.in +++ b/build-aux/check.sh.in @@ -88,7 +88,7 @@ fi -nostdlib " LIBS=-lc - AR="${srcdest}pre-inst-env ar" + AR="${srcdest}pre-inst-env mesar" CC="${srcdest}pre-inst-env mescc" ../pre-inst-env ${SHELL} ${srcdest}build-aux/check-mescc.sh ) diff --git a/build-aux/install.sh.in b/build-aux/install.sh.in index 60c581c3..ef686d84 100644 --- a/build-aux/install.sh.in +++ b/build-aux/install.sh.in @@ -42,7 +42,7 @@ fi DESTDIR=${DESTDIR-} mkdir -p ${DESTDIR}${bindir} cp $_v src/mes ${DESTDIR}${bindir}/mes -cp $_v scripts/ar ${DESTDIR}${bindir}/ar +cp $_v scripts/mesar ${DESTDIR}${bindir}/mesar cp $_v scripts/mescc.scm ${DESTDIR}${bindir}/mescc.scm cp $_v scripts/mescc ${DESTDIR}${bindir}/mescc diff --git a/configure b/configure index 4d88bb9b..473622b8 100755 --- a/configure +++ b/configure @@ -631,12 +631,12 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system) "build-aux/install.sh.in" "build-aux/pre-inst-env.in" "build-aux/uninstall.sh.in" - "scripts/ar.in" + "scripts/mesar.in" "scripts/mescc.scm.in" "scripts/mescc.in" )) (chmod "pre-inst-env" #o755) - (chmod "scripts/ar" #o755) + (chmod "scripts/mesar" #o755) (chmod "scripts/mescc" #o755) (chmod "scripts/mescc.scm" #o755) (chmod "build.sh" #o755) diff --git a/configure.sh b/configure.sh index f8ea3acd..271f11f5 100755 --- a/configure.sh +++ b/configure.sh @@ -248,8 +248,8 @@ subst ${srcdest}build-aux/install.sh.in install.sh chmod +x install.sh subst ${srcdest}build-aux/pre-inst-env.in pre-inst-env chmod +x pre-inst-env -subst ${srcdest}scripts/ar.in scripts/ar -chmod +x scripts/ar +subst ${srcdest}scripts/mesar.in scripts/mesar +chmod +x scripts/mesar subst ${srcdest}scripts/mescc.scm.in scripts/mescc.scm chmod +x scripts/mescc.scm subst ${srcdest}scripts/mescc.in scripts/mescc diff --git a/scripts/ar.in b/scripts/mesar.in similarity index 100% rename from scripts/ar.in rename to scripts/mesar.in