summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2002-07-29 07:55:49 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2002-07-29 07:55:49 +0000
commit3d36fe3d826aa880ff80751a43fb06ee840a19b8 (patch)
treece073046ae3f171ccdf448f741eb970122ae6b6a /scripts
parent2002-07-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-3d36fe3d826aa880ff80751a43fb06ee840a19b8.tar.bz2
2002-07-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Use AC_CONFIG_FILES(script, chmod +x script) to generate mk*spec scripts. * mkbspspec.in: Use ',' as pattern delimiter in sed expression for $rpm_build_root. * mkbinutilsspec.in: Use ',' as pattern delimiter in sed expression for $rpm_build_root. * cpukit/mkspec.in: Cosmetical changes.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/ChangeLog10
-rw-r--r--scripts/configure.ac16
-rw-r--r--scripts/cpukit/mkspec.in3
-rw-r--r--scripts/mkbinutilspec.in2
-rw-r--r--scripts/mkbspspec.in2
5 files changed, 22 insertions, 11 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index 83046dd23b..0a6bc45645 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,5 +1,15 @@
2002-07-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+ * configure.ac: Use AC_CONFIG_FILES(script, chmod +x script)
+ to generate mk*spec scripts.
+ * mkbspspec.in: Use ',' as pattern delimiter in sed expression
+ for $rpm_build_root.
+ * mkbinutilsspec.in: Use ',' as pattern delimiter in sed
+ expression for $rpm_build_root.
+ * cpukit/mkspec.in: Cosmetical changes.
+
+2002-07-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* ChangeLog: Fix 2002-07-22 ChangeLog entry bogusly referring to
Joel.
* cpukit/Makefile.am: New.
diff --git a/scripts/configure.ac b/scripts/configure.ac
index 3183da5a69..ef33954620 100644
--- a/scripts/configure.ac
+++ b/scripts/configure.ac
@@ -78,13 +78,6 @@ AC_SUBST(BSPVERS)
AC_SUBST(RPM_CPU)
AC_CONFIG_FILES([Makefile
-buildall
-buildalltar
-mkbinutilspec
-mkgccnewlibspec
-mkgcc3newlibspec
-mkgdbspec
-mkbspspec
binutils/Makefile
gccnewlib/Makefile
gcc3newlib/Makefile
@@ -94,7 +87,16 @@ autotools/Makefile
autotools/automake-rtems.spec
cpukit/Makefile
])
+
+AC_CONFIG_FILES([buildalltar],[chmod +x buildalltar])
+AC_CONFIG_FILES([buildall],[chmod +x buildall])
+AC_CONFIG_FILES([mkgdbspec],[chmod +x mkgdbspec])
+AC_CONFIG_FILES([mkbinutilspec],[chmod +x mkbinutilspec])
+AC_CONFIG_FILES([mkgccnewlibspec],[chmod +x mkgccnewlibspec])
+AC_CONFIG_FILES([mkgcc3newlibspec],[chmod +x mkgcc3newlibspec])
+AC_CONFIG_FILES([mkbspspec],[chmod +x mkbspspec])
AC_CONFIG_FILES([cpukit/mkspec],[chmod +x cpukit/mkspec])
+
AC_CONFIG_COMMANDS([default],[[chmod 755 buildall
chmod 755 buildalltar
]],[[]])
diff --git a/scripts/cpukit/mkspec.in b/scripts/cpukit/mkspec.in
index d44ce336d7..01add5830e 100644
--- a/scripts/cpukit/mkspec.in
+++ b/scripts/cpukit/mkspec.in
@@ -1,5 +1,4 @@
-#!/bin/sh
-#
+#! /bin/sh
RTEMS_DIR=`dirname $0`/@top_srcdir@
RTEMS_VERSION=@VERSION@
diff --git a/scripts/mkbinutilspec.in b/scripts/mkbinutilspec.in
index de8bb89239..3f7111d24f 100644
--- a/scripts/mkbinutilspec.in
+++ b/scripts/mkbinutilspec.in
@@ -56,7 +56,7 @@ PATCH2="%patch0 -p0"
fi
sed -e "s%@Release\@%${binutils_rpm_release}%g" \
- -e "s%@rpm_build_root\@%${rpm_build_root}%g" \
+ -e "s,@rpm_build_root\@,${rpm_build_root},g" \
-e "s%@target_alias\@%${target_alias}%g" \
-e "s%@prefix\@%@prefix@%g" \
-e "s%@binutils_version\@%${binutils_version}%g" \
diff --git a/scripts/mkbspspec.in b/scripts/mkbspspec.in
index 83e10eda39..0602f90eff 100644
--- a/scripts/mkbspspec.in
+++ b/scripts/mkbspspec.in
@@ -53,7 +53,7 @@ specfile=${dst}/$target_alias-$bsp-${rtems_version}.spec
sed -e "s%@Release\@%${rtems_rpm_release}%g" \
-e "s%@bsp\@%${bsp}%g" \
-e "s%@rtems_version\@%${rtems_version}%g" \
- -e "s%@rpm_build_root\@%${rpm_build_root}%g" \
+ -e "s,@rpm_build_root\@,${rpm_build_root},g" \
-e "s%@target_alias\@%${target_alias}%g" \
-e "s%@exe_ext\@%${exe_ext}%g" \
< ${RTEMS_DIR}/rtems/rtems.spec.in \