summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2009-11-30 08:49:41 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2009-11-30 08:49:41 +0000
commitd03b469f6d2d7f66c93115306d37ce1221d024e9 (patch)
tree2583b9d5e7fe18b59ec41794791c11b665438b6a /contrib
parentAdd freebsd8.0 (diff)
downloadrtems-d03b469f6d2d7f66c93115306d37ce1221d024e9.tar.bz2
Update.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/crossrpms/.cvsignore2
-rw-r--r--contrib/crossrpms/freebsd6.4/gcc.am6
-rw-r--r--contrib/crossrpms/freebsd7.1/gcc.am6
-rw-r--r--contrib/crossrpms/freebsd7.2/gcc.am6
-rw-r--r--contrib/crossrpms/mingw32/i686/.cvsignore8
-rw-r--r--contrib/crossrpms/solaris2.7/gcc.am6
6 files changed, 17 insertions, 17 deletions
diff --git a/contrib/crossrpms/.cvsignore b/contrib/crossrpms/.cvsignore
index 44eaab4c86..74b1750cc6 100644
--- a/contrib/crossrpms/.cvsignore
+++ b/contrib/crossrpms/.cvsignore
@@ -3,7 +3,7 @@ Makefile
Makefile.in
aclocal.m4
configure
-config.*
+config.guess
autom4te*
missing
install-sh
diff --git a/contrib/crossrpms/freebsd6.4/gcc.am b/contrib/crossrpms/freebsd6.4/gcc.am
index 2a561ae319..466d72ead3 100644
--- a/contrib/crossrpms/freebsd6.4/gcc.am
+++ b/contrib/crossrpms/freebsd6.4/gcc.am
@@ -17,12 +17,14 @@ GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add
- cat $(GCC_SUBPACKAGES) | sed \
+$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
+ cat $(GCC_SUBPACKAGES) \
+ | sed \
-e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-e "/[@]SOURCES[@]/d" \
-e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-e "/[@]PREP[@]/d" \
+ | sed \
-e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
diff --git a/contrib/crossrpms/freebsd7.1/gcc.am b/contrib/crossrpms/freebsd7.1/gcc.am
index 2a561ae319..466d72ead3 100644
--- a/contrib/crossrpms/freebsd7.1/gcc.am
+++ b/contrib/crossrpms/freebsd7.1/gcc.am
@@ -17,12 +17,14 @@ GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add
- cat $(GCC_SUBPACKAGES) | sed \
+$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
+ cat $(GCC_SUBPACKAGES) \
+ | sed \
-e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-e "/[@]SOURCES[@]/d" \
-e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-e "/[@]PREP[@]/d" \
+ | sed \
-e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
diff --git a/contrib/crossrpms/freebsd7.2/gcc.am b/contrib/crossrpms/freebsd7.2/gcc.am
index 2a561ae319..466d72ead3 100644
--- a/contrib/crossrpms/freebsd7.2/gcc.am
+++ b/contrib/crossrpms/freebsd7.2/gcc.am
@@ -17,12 +17,14 @@ GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add
GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add
GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add
-$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add
- cat $(GCC_SUBPACKAGES) | sed \
+$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am
+ cat $(GCC_SUBPACKAGES) \
+ | sed \
-e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \
-e "/[@]SOURCES[@]/d" \
-e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \
-e "/[@]PREP[@]/d" \
+ | sed \
-e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \
-e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \
-e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \
diff --git a/contrib/crossrpms/mingw32/i686/.cvsignore b/contrib/crossrpms/mingw32/i686/.cvsignore
index f36fedb417..11289e9f57 100644
--- a/contrib/crossrpms/mingw32/i686/.cvsignore
+++ b/contrib/crossrpms/mingw32/i686/.cvsignore
@@ -1,9 +1,3 @@
Makefile
Makefile.in
-*.spec
-i686-pc-mingw32-binutils.spec.in
-i686-pc-mingw32-gcc.spec.in
-i686-pc-mingw32-gmp.spec.in
-i686-pc-mingw32-libs.spec.in
-i686-pc-mingw32-mpfr.spec.in
-i686-pc-mingw32-w32api.spec.in
+*.spec.in
diff --git a/contrib/crossrpms/solaris2.7/gcc.am b/contrib/crossrpms/solaris2.7/gcc.am
index 2a561ae319..5deef27303 100644
--- a/contrib/crossrpms/solaris2.7/gcc.am
+++ b/contrib/crossrpms/solaris2.7/gcc.am
@@ -32,9 +32,9 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add
| $(MKSPEC0) > $(TARGET)-gcc.spec.in
CLEANFILES += $(TARGET)-gcc.spec.in
-@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
+$(rpmprefix)$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in
$(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@
-CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec
-noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec
+CLEANFILES += $(rpmprefix)$(TARGET)-gcc.spec
+noinst_DATA += $(rpmprefix)$(TARGET)-gcc.spec
EXTRA_DIST += $(GCC_SUBPACKAGES)