diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am index ebc6271c3e..a4259268d4 100644 --- a/contrib/crossrpms/cygwin/Makefile.am +++ b/contrib/crossrpms/cygwin/Makefile.am @@ -93,11 +93,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in - sed \ - -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ - -e "s,[@]_prefix[@],$(prefix),g" \ - -e "s/[@]tool_target[@]/$(TARGET)/g" \ - -e "/[@]PATCH/d" \ - $(srcdir)/$(TARGET)-gcc.spec.in > $@ + $(MKSPEC) $(srcdir)/$(TARGET)-gcc.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am index 545fcf33c8..737198649b 100644 --- a/contrib/crossrpms/freebsd5.2/Makefile.am +++ b/contrib/crossrpms/freebsd5.2/Makefile.am @@ -94,11 +94,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in - sed \ - -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ - -e "s,[@]_prefix[@],$(prefix),g" \ - -e "s/[@]tool_target[@]/$(TARGET)/g" \ - -e "/[@]PATCH/d" \ - $(srcdir)/$(TARGET)-gcc.spec.in > $@ + $(MKSPEC) $(srcdir)/$(TARGET)-gcc.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec diff --git a/contrib/crossrpms/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am index e967bed96c..0a2bf55a90 100644 --- a/contrib/crossrpms/freebsd6.0/Makefile.am +++ b/contrib/crossrpms/freebsd6.0/Makefile.am @@ -94,11 +94,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in - sed \ - -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ - -e "s,[@]_prefix[@],$(prefix),g" \ - -e "s/[@]tool_target[@]/$(TARGET)/g" \ - -e "/[@]PATCH/d" \ - $(srcdir)/$(TARGET)-gcc.spec.in > $@ + $(MKSPEC) $(srcdir)/$(TARGET)-gcc.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am index caf7a6bae9..a50c1ec00d 100644 --- a/contrib/crossrpms/mingw32/Makefile.am +++ b/contrib/crossrpms/mingw32/Makefile.am @@ -119,11 +119,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in - sed \ - -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ - -e "s,[@]_prefix[@],$(prefix),g" \ - -e "s/[@]tool_target[@]/$(TARGET)/g" \ - -e "/[@]PATCH/d" \ - $(srcdir)/$(TARGET)-gcc.spec.in > $@ + $(MKSPEC) $(srcdir)/$(TARGET)-gcc.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec diff --git a/contrib/crossrpms/rtems/Makefile.am b/contrib/crossrpms/rtems/Makefile.am index adf9184888..20288321e9 100644 --- a/contrib/crossrpms/rtems/Makefile.am +++ b/contrib/crossrpms/rtems/Makefile.am @@ -72,14 +72,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in - sed \ - -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ - -e "s,[@]_prefix[@],$(prefix),g" \ - -e "s/[@]tool_target[@]/$(TARGET)/g" \ - -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ - -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ - -e "s/[@]NEWLIB_VERS[@]/$(NEWLIB_VERS)/g" \ - -e "/[@]PATCH/d" \ - $(srcdir)/$(TARGET)-gcc.spec.in > $@ + $(MKSPEC) $(srcdir)/$(TARGET)-gcc.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am index d67b074ab1..c9b3c6d0a7 100644 --- a/contrib/crossrpms/solaris2.7/Makefile.am +++ b/contrib/crossrpms/solaris2.7/Makefile.am @@ -94,11 +94,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in - sed \ - -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ - -e "s,[@]_prefix[@],$(prefix),g" \ - -e "s/[@]tool_target[@]/$(TARGET)/g" \ - -e "/[@]PATCH/d" \ - $(srcdir)/$(TARGET)-gcc.spec.in > $@ + $(MKSPEC) $(srcdir)/$(TARGET)-gcc.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec