diff options
-rw-r--r-- | contrib/crossrpms/cygwin/Makefile.am | 4 | ||||
-rw-r--r-- | contrib/crossrpms/freebsd5.2/Makefile.am | 4 | ||||
-rw-r--r-- | contrib/crossrpms/freebsd6.0/Makefile.am | 4 | ||||
-rw-r--r-- | contrib/crossrpms/mingw32/Makefile.am | 4 | ||||
-rw-r--r-- | contrib/crossrpms/rtems/Makefile.am | 4 | ||||
-rw-r--r-- | contrib/crossrpms/solaris2.7/Makefile.am | 4 |
6 files changed, 18 insertions, 6 deletions
diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am index 95001f4f4b..f54a3c8eea 100644 --- a/contrib/crossrpms/cygwin/Makefile.am +++ b/contrib/crossrpms/cygwin/Makefile.am @@ -71,10 +71,12 @@ GCC_SUBPACKAGES += ../gcc/target-gcc.add GCC_SUBPACKAGES += ../gcc/base-gcc.add GCC_SUBPACKAGES += ../gcc/target-c++.add -$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add +$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add gcc-prep.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ + -e "/[@]PREP[@]/r ./gcc-prep.add" \ + -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "/[@]tool_target[@]-newlib/d" \ diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am index 69189522bf..b889ba50dd 100644 --- a/contrib/crossrpms/freebsd5.2/Makefile.am +++ b/contrib/crossrpms/freebsd5.2/Makefile.am @@ -71,10 +71,12 @@ GCC_SUBPACKAGES += ../gcc/target-gcc.add GCC_SUBPACKAGES += ../gcc/base-gcc.add GCC_SUBPACKAGES += ../gcc/target-c++.add -$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add +$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add gcc-prep.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ + -e "/[@]PREP[@]/r ./gcc-prep.add" \ + -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "/[@]tool_target[@]-newlib/d" \ diff --git a/contrib/crossrpms/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am index 71d2455ec7..5bdbaec18e 100644 --- a/contrib/crossrpms/freebsd6.0/Makefile.am +++ b/contrib/crossrpms/freebsd6.0/Makefile.am @@ -71,10 +71,12 @@ GCC_SUBPACKAGES += ../gcc/target-gcc.add GCC_SUBPACKAGES += ../gcc/base-gcc.add GCC_SUBPACKAGES += ../gcc/target-c++.add -$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add +$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add gcc-prep.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ + -e "/[@]PREP[@]/r ./gcc-prep.add" \ + -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "/[@]tool_target[@]-newlib/d" \ diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am index 3f54fba8c0..a9cf2b5144 100644 --- a/contrib/crossrpms/mingw32/Makefile.am +++ b/contrib/crossrpms/mingw32/Makefile.am @@ -92,10 +92,12 @@ GCC_SUBPACKAGES += ../gcc/target-gcc.add GCC_SUBPACKAGES += ../gcc/base-gcc.add GCC_SUBPACKAGES += ../gcc/target-c++.add -$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add +$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add gcc-prep.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ + -e "/[@]PREP[@]/r ./gcc-prep.add" \ + -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "/[@]tool_target[@]-newlib/d" \ diff --git a/contrib/crossrpms/rtems/Makefile.am b/contrib/crossrpms/rtems/Makefile.am index fc805b086b..281e7e651c 100644 --- a/contrib/crossrpms/rtems/Makefile.am +++ b/contrib/crossrpms/rtems/Makefile.am @@ -52,10 +52,12 @@ GCC_SUBPACKAGES += ../gcc/target-c++.add GCC_SUBPACKAGES += ../gcc/base-libc.add GCC_SUBPACKAGES += ../gcc/target-libc.add -$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add +$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add gcc-prep.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ + -e "/[@]PREP[@]/r ./gcc-prep.add" \ + -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "s/[@]NEWLIB_VERS[@]/$(NEWLIB_VERS)/g" \ diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am index d9a3a0ef9a..0a3a94df4f 100644 --- a/contrib/crossrpms/solaris2.7/Makefile.am +++ b/contrib/crossrpms/solaris2.7/Makefile.am @@ -71,10 +71,12 @@ GCC_SUBPACKAGES += ../gcc/target-gcc.add GCC_SUBPACKAGES += ../gcc/base-gcc.add GCC_SUBPACKAGES += ../gcc/target-c++.add -$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add +$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add gcc-prep.add cat $(GCC_SUBPACKAGES) | sed \ -e "/[@]SOURCES[@]/r ./gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ + -e "/[@]PREP[@]/r ./gcc-prep.add" \ + -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ -e "/[@]tool_target[@]-newlib/d" \ |