From 677c3d81cfcb3f92303c4b2acd461cfaa32076ba Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 19 Jun 2006 07:00:05 +0000 Subject: More preps for VPATH builds. --- contrib/crossrpms/cygwin/Makefile.am | 78 ++++++++++++++++---------------- contrib/crossrpms/freebsd5.2/Makefile.am | 58 ++++++++++++------------ contrib/crossrpms/mingw32/Makefile.am | 76 +++++++++++++++---------------- contrib/crossrpms/rtems/Makefile.am | 2 +- contrib/crossrpms/solaris2.7/Makefile.am | 64 +++++++++++++------------- 5 files changed, 139 insertions(+), 139 deletions(-) (limited to 'contrib') diff --git a/contrib/crossrpms/cygwin/Makefile.am b/contrib/crossrpms/cygwin/Makefile.am index 54dacdb1d0..d3ed18f32e 100644 --- a/contrib/crossrpms/cygwin/Makefile.am +++ b/contrib/crossrpms/cygwin/Makefile.am @@ -13,11 +13,11 @@ CYGWIN_RPMREL = @VERSION@ EXTRA_DIST += libs.add EXTRA_DIST += target-libs.add -LIBS_SUBPACKAGES = $(top_builddir)/common/common.add -LIBS_SUBPACKAGES += libs.add -LIBS_SUBPACKAGES += ../gcc/rpm-install.add -LIBS_SUBPACKAGES += $(top_builddir)/common/clean.add -LIBS_SUBPACKAGES += target-libs.add +LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add +LIBS_SUBPACKAGES += $(top_srcdir)/cygwin/libs.add +LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add +LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add +LIBS_SUBPACKAGES += $(top_srcdir)/cygwin/target-libs.add $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am cat $(LIBS_SUBPACKAGES) | sed \ @@ -28,21 +28,21 @@ $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am CLEANFILES += $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in - $(MKSPEC) $(srcdir)/$(TARGET)-libs.spec.in > $@ + $(MKSPEC) $(TARGET)-libs.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-libs.spec noinst_DATA += @rpmprefix@$(TARGET)-libs.spec -W32API_VERS = 3.6-1 +W32API_VERS = 3.7-1 W32API_RPMREL = @VERSION@ EXTRA_DIST += target-w32api.add EXTRA_DIST += w32api.add -W32API_SUBPACKAGES = $(top_builddir)/common/common.add -W32API_SUBPACKAGES += w32api.add -W32API_SUBPACKAGES += ../gcc/rpm-install.add -W32API_SUBPACKAGES += $(top_builddir)/common/clean.add -W32API_SUBPACKAGES += target-w32api.add +W32API_SUBPACKAGES = $(top_srcdir)/common/common.add +W32API_SUBPACKAGES += $(top_srcdir)/cygwin/w32api.add +W32API_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add +W32API_SUBPACKAGES += $(top_srcdir)/common/clean.add +W32API_SUBPACKAGES += $(top_srcdir)/cygwin/target-w32api.add $(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES) Makefile.am cat $(W32API_SUBPACKAGES) | sed \ @@ -53,7 +53,7 @@ $(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES) Makefile.am CLEANFILES += $(TARGET)-w32api.spec.in @rpmprefix@$(TARGET)-w32api.spec: $(TARGET)-w32api.spec.in - $(MKSPEC) $(srcdir)/$(TARGET)-w32api.spec.in > $@ + $(MKSPEC) $(TARGET)-w32api.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-w32api.spec noinst_DATA += @rpmprefix@$(TARGET)-w32api.spec @@ -64,19 +64,19 @@ BINUTILS_VERS = 20050610-1 BINUTILS_RPMREL = @VERSION@ EXTRA_DIST += binutils-sources.add -BINUTILS_SUBPACKAGES = $(top_builddir)/common/common.add -BINUTILS_SUBPACKAGES += ../binutils/binutils.add -BINUTILS_SUBPACKAGES += ../binutils/prep.add -BINUTILS_SUBPACKAGES += ../binutils/build.add -BINUTILS_SUBPACKAGES += ../binutils/install.add -BINUTILS_SUBPACKAGES += ../binutils/rpm-install.add -BINUTILS_SUBPACKAGES += $(top_builddir)/common/clean.add -BINUTILS_SUBPACKAGES += ../binutils/target-binutils.add -BINUTILS_SUBPACKAGES += ../binutils/base-binutils.add +BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources.add cat $(BINUTILS_SUBPACKAGES) | sed \ - -e "/[@]SOURCES[@]/r ./binutils-sources.add" \ + -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \ -e "/[@]SOURCES[@]/d" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ @@ -84,7 +84,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources CLEANFILES += $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in - $(MKSPEC) $(srcdir)/$(TARGET)-binutils.spec.in > $@ + $(MKSPEC) $(TARGET)-binutils.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec @@ -94,24 +94,24 @@ GCC_RPMREL = @VERSION@ EXTRA_DIST += gcc-prep.add EXTRA_DIST += gcc-sources.add -GCC_SUBPACKAGES = $(top_builddir)/common/common.add -GCC_SUBPACKAGES += ../gcc/gccnewlib.add -GCC_SUBPACKAGES += ../gcc/prep.add -GCC_SUBPACKAGES += ../gcc/build.add -GCC_SUBPACKAGES += ../gcc/install.add -GCC_SUBPACKAGES += ../gcc/rpm-install.add -GCC_SUBPACKAGES += $(top_builddir)/common/clean.add -GCC_SUBPACKAGES += ../gcc/target-gcc.add -GCC_SUBPACKAGES += ../gcc/base-gcc.add -GCC_SUBPACKAGES += ../gcc/target-c++.add -GCC_SUBPACKAGES += ../gcc/target-gfortran.add ../gcc/base-gfortran.add -GCC_SUBPACKAGES += ../gcc/target-objc.add +GCC_SUBPACKAGES = $(top_srcdir)/common/common.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add +GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add $(top_srcdir)/gcc/base-gfortran.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.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[@]/r $(srcdir)/gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e "/[@]PREP[@]/r ./gcc-prep.add" \ + -e "/[@]PREP[@]/r $(srcdir)/gcc-prep.add" \ -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ @@ -123,6 +123,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add gcc-prep.a CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in - $(MKSPEC) $(srcdir)/$(TARGET)-gcc.spec.in > $@ + $(MKSPEC) $(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 6ad504ce1a..ca5b7b31aa 100644 --- a/contrib/crossrpms/freebsd5.2/Makefile.am +++ b/contrib/crossrpms/freebsd5.2/Makefile.am @@ -13,11 +13,11 @@ FREEBSD_RPMREL = @VERSION@ EXTRA_DIST += libs.add EXTRA_DIST += target-libs.add -LIBS_SUBPACKAGES = $(top_builddir)/common/common.add -LIBS_SUBPACKAGES += libs.add -LIBS_SUBPACKAGES += ../gcc/rpm-install.add -LIBS_SUBPACKAGES += $(top_builddir)/common/clean.add -LIBS_SUBPACKAGES += target-libs.add +LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add +LIBS_SUBPACKAGES += $(srcdir)/libs.add +LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add +LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add +LIBS_SUBPACKAGES += $(srcdir)/target-libs.add $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am cat $(LIBS_SUBPACKAGES) | sed \ @@ -37,19 +37,19 @@ BINUTILS_VERS = 2.16.1 BINUTILS_RPMREL = @VERSION@ EXTRA_DIST += binutils-sources.add -BINUTILS_SUBPACKAGES = $(top_builddir)/common/common.add -BINUTILS_SUBPACKAGES += ../binutils/binutils.add -BINUTILS_SUBPACKAGES += ../binutils/prep.add -BINUTILS_SUBPACKAGES += ../binutils/build.add -BINUTILS_SUBPACKAGES += ../binutils/install.add -BINUTILS_SUBPACKAGES += ../binutils/rpm-install.add -BINUTILS_SUBPACKAGES += $(top_builddir)/common/clean.add -BINUTILS_SUBPACKAGES += ../binutils/target-binutils.add -BINUTILS_SUBPACKAGES += ../binutils/base-binutils.add +BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources.add cat $(BINUTILS_SUBPACKAGES) | sed \ - -e "/[@]SOURCES[@]/r ./binutils-sources.add" \ + -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \ -e "/[@]SOURCES[@]/d" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ @@ -67,24 +67,24 @@ GCC_RPMREL = @VERSION@ EXTRA_DIST += gcc-prep.add EXTRA_DIST += gcc-sources.add -GCC_SUBPACKAGES = $(top_builddir)/common/common.add -GCC_SUBPACKAGES += ../gcc/gccnewlib.add -GCC_SUBPACKAGES += ../gcc/prep.add -GCC_SUBPACKAGES += ../gcc/build.add -GCC_SUBPACKAGES += ../gcc/install.add -GCC_SUBPACKAGES += ../gcc/rpm-install.add -GCC_SUBPACKAGES += $(top_builddir)/common/clean.add -GCC_SUBPACKAGES += ../gcc/target-gcc.add -GCC_SUBPACKAGES += ../gcc/base-gcc.add -GCC_SUBPACKAGES += ../gcc/target-c++.add -GCC_SUBPACKAGES += ../gcc/target-gfortran.add ../gcc/base-gfortran.add -GCC_SUBPACKAGES += ../gcc/target-objc.add +GCC_SUBPACKAGES = $(top_srcdir)/common/common.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add +GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add $(top_srcdir)/gcc/base-gfortran.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.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[@]/r $(srcdir)/gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e "/[@]PREP[@]/r ./gcc-prep.add" \ + -e "/[@]PREP[@]/r $(srcdir)/gcc-prep.add" \ -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ diff --git a/contrib/crossrpms/mingw32/Makefile.am b/contrib/crossrpms/mingw32/Makefile.am index 1dded83e05..8254856867 100644 --- a/contrib/crossrpms/mingw32/Makefile.am +++ b/contrib/crossrpms/mingw32/Makefile.am @@ -13,11 +13,11 @@ MINGW32_RPMREL = @VERSION@ EXTRA_DIST += libs.add EXTRA_DIST += target-libs.add -LIBS_SUBPACKAGES = $(top_builddir)/common/common.add -LIBS_SUBPACKAGES += libs.add -LIBS_SUBPACKAGES += ../gcc/rpm-install.add -LIBS_SUBPACKAGES += $(top_builddir)/common/clean.add -LIBS_SUBPACKAGES += target-libs.add +LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add +LIBS_SUBPACKAGES += $(srcdir)/libs.add +LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add +LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add +LIBS_SUBPACKAGES += $(srcdir)/target-libs.add $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am cat $(LIBS_SUBPACKAGES) | sed \ @@ -28,7 +28,7 @@ $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am CLEANFILES += $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in - $(MKSPEC) $(srcdir)/$(TARGET)-libs.spec.in > $@ + $(MKSPEC) $(TARGET)-libs.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-libs.spec noinst_DATA += @rpmprefix@$(TARGET)-libs.spec @@ -37,11 +37,11 @@ W32API_RPMREL = @VERSION@ EXTRA_DIST += target-w32api.add EXTRA_DIST += w32api.add -W32API_SUBPACKAGES = $(top_builddir)/common/common.add -W32API_SUBPACKAGES += w32api.add -W32API_SUBPACKAGES += ../gcc/rpm-install.add -W32API_SUBPACKAGES += $(top_builddir)/common/clean.add -W32API_SUBPACKAGES += target-w32api.add +W32API_SUBPACKAGES = $(top_srcdir)/common/common.add +W32API_SUBPACKAGES += $(srcdir)/w32api.add +W32API_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add +W32API_SUBPACKAGES += $(top_srcdir)/common/clean.add +W32API_SUBPACKAGES += $(srcdir)/target-w32api.add $(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES) Makefile.am cat $(W32API_SUBPACKAGES) | sed \ @@ -52,7 +52,7 @@ $(TARGET)-w32api.spec.in: $(W32API_SUBPACKAGES) Makefile.am CLEANFILES += $(TARGET)-w32api.spec.in @rpmprefix@$(TARGET)-w32api.spec: $(TARGET)-w32api.spec.in - $(MKSPEC) $(srcdir)/$(TARGET)-w32api.spec.in > $@ + $(MKSPEC) $(TARGET)-w32api.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-w32api.spec noinst_DATA += @rpmprefix@$(TARGET)-w32api.spec @@ -61,19 +61,19 @@ BINUTILS_VERS = 2.16.91-20060119-1 BINUTILS_RPMREL = @VERSION@ EXTRA_DIST += binutils-sources.add -BINUTILS_SUBPACKAGES = $(top_builddir)/common/common.add -BINUTILS_SUBPACKAGES += ../binutils/binutils.add -BINUTILS_SUBPACKAGES += ../binutils/prep.add -BINUTILS_SUBPACKAGES += ../binutils/build.add -BINUTILS_SUBPACKAGES += ../binutils/install.add -BINUTILS_SUBPACKAGES += ../binutils/rpm-install.add -BINUTILS_SUBPACKAGES += $(top_builddir)/common/clean.add -BINUTILS_SUBPACKAGES += ../binutils/target-binutils.add -BINUTILS_SUBPACKAGES += ../binutils/base-binutils.add +BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources.add cat $(BINUTILS_SUBPACKAGES) | sed \ - -e "/[@]SOURCES[@]/r ./binutils-sources.add" \ + -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \ -e "/[@]SOURCES[@]/d" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ @@ -81,7 +81,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources CLEANFILES += $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in - $(MKSPEC) $(srcdir)/$(TARGET)-binutils.spec.in > $@ + $(MKSPEC) $(TARGET)-binutils.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec @@ -91,24 +91,24 @@ GCC_RPMREL = @VERSION@ EXTRA_DIST += gcc-prep.add EXTRA_DIST += gcc-sources.add -GCC_SUBPACKAGES = $(top_builddir)/common/common.add -GCC_SUBPACKAGES += ../gcc/gccnewlib.add -GCC_SUBPACKAGES += ../gcc/prep.add -GCC_SUBPACKAGES += ../gcc/build.add -GCC_SUBPACKAGES += ../gcc/install.add -GCC_SUBPACKAGES += ../gcc/rpm-install.add -GCC_SUBPACKAGES += $(top_builddir)/common/clean.add -GCC_SUBPACKAGES += ../gcc/target-gcc.add -GCC_SUBPACKAGES += ../gcc/base-gcc.add -GCC_SUBPACKAGES += ../gcc/target-c++.add -GCC_SUBPACKAGES += ../gcc/target-gfortran.add ../gcc/base-gfortran.add -GCC_SUBPACKAGES += ../gcc/target-objc.add +GCC_SUBPACKAGES = $(top_srcdir)/common/common.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add +GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add $(top_srcdir)/gcc/base-gfortran.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.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[@]/r $(srcdir)/gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e "/[@]PREP[@]/r ./gcc-prep.add" \ + -e "/[@]PREP[@]/r $(srcdir)/gcc-prep.add" \ -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ @@ -119,6 +119,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add gcc-prep.a CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in - $(MKSPEC) $(srcdir)/$(TARGET)-gcc.spec.in > $@ + $(MKSPEC) $(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 5fae65a6ad..4bdadccbda 100644 --- a/contrib/crossrpms/rtems/Makefile.am +++ b/contrib/crossrpms/rtems/Makefile.am @@ -8,7 +8,7 @@ noinst_DATA = CLEANFILES = EXTRA_DIST = -BINUTILS_VERS = 2.16.1 +BINUTILS_VERS = 2.16.94 BINUTILS_RPMREL = @VERSION@ EXTRA_DIST += binutils-sources.add diff --git a/contrib/crossrpms/solaris2.7/Makefile.am b/contrib/crossrpms/solaris2.7/Makefile.am index 26a8a5c95d..fb0ef30ec8 100644 --- a/contrib/crossrpms/solaris2.7/Makefile.am +++ b/contrib/crossrpms/solaris2.7/Makefile.am @@ -13,11 +13,11 @@ SOLARIS_RPMREL = @VERSION@ EXTRA_DIST += libs.add EXTRA_DIST += target-libs.add -LIBS_SUBPACKAGES = $(top_builddir)/common/common.add -LIBS_SUBPACKAGES += libs.add -LIBS_SUBPACKAGES += ../gcc/rpm-install.add -LIBS_SUBPACKAGES += $(top_builddir)/common/clean.add -LIBS_SUBPACKAGES += target-libs.add +LIBS_SUBPACKAGES = $(top_srcdir)/common/common.add +LIBS_SUBPACKAGES += $(srcdir)/libs.add +LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add +LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add +LIBS_SUBPACKAGES += $(srcdir)/target-libs.add $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am cat $(LIBS_SUBPACKAGES) | sed \ @@ -28,7 +28,7 @@ $(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) Makefile.am CLEANFILES += $(TARGET)-libs.spec.in @rpmprefix@$(TARGET)-libs.spec: $(TARGET)-libs.spec.in - $(MKSPEC) $(srcdir)/$(TARGET)-libs.spec.in > $@ + $(MKSPEC) $(TARGET)-libs.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-libs.spec noinst_DATA += @rpmprefix@$(TARGET)-libs.spec @@ -37,19 +37,19 @@ BINUTILS_VERS = 2.16.1 BINUTILS_RPMREL = @VERSION@ EXTRA_DIST += binutils-sources.add -BINUTILS_SUBPACKAGES = $(top_builddir)/common/common.add -BINUTILS_SUBPACKAGES += ../binutils/binutils.add -BINUTILS_SUBPACKAGES += ../binutils/prep.add -BINUTILS_SUBPACKAGES += ../binutils/build.add -BINUTILS_SUBPACKAGES += ../binutils/install.add -BINUTILS_SUBPACKAGES += ../binutils/rpm-install.add -BINUTILS_SUBPACKAGES += $(top_builddir)/common/clean.add -BINUTILS_SUBPACKAGES += ../binutils/target-binutils.add -BINUTILS_SUBPACKAGES += ../binutils/base-binutils.add +BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add +BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources.add cat $(BINUTILS_SUBPACKAGES) | sed \ - -e "/[@]SOURCES[@]/r ./binutils-sources.add" \ + -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \ -e "/[@]SOURCES[@]/d" \ -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)/g" \ @@ -57,7 +57,7 @@ $(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am binutils-sources CLEANFILES += $(TARGET)-binutils.spec.in @rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in - $(MKSPEC) $(srcdir)/$(TARGET)-binutils.spec.in > $@ + $(MKSPEC) $(TARGET)-binutils.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec @@ -67,24 +67,24 @@ GCC_RPMREL = @VERSION@ EXTRA_DIST += gcc-prep.add EXTRA_DIST += gcc-sources.add -GCC_SUBPACKAGES = $(top_builddir)/common/common.add -GCC_SUBPACKAGES += ../gcc/gccnewlib.add -GCC_SUBPACKAGES += ../gcc/prep.add -GCC_SUBPACKAGES += ../gcc/build.add -GCC_SUBPACKAGES += ../gcc/install.add -GCC_SUBPACKAGES += ../gcc/rpm-install.add -GCC_SUBPACKAGES += $(top_builddir)/common/clean.add -GCC_SUBPACKAGES += ../gcc/target-gcc.add -GCC_SUBPACKAGES += ../gcc/base-gcc.add -GCC_SUBPACKAGES += ../gcc/target-c++.add -GCC_SUBPACKAGES += ../gcc/target-gfortran.add ../gcc/base-gfortran.add -GCC_SUBPACKAGES += ../gcc/target-objc.add +GCC_SUBPACKAGES = $(top_srcdir)/common/common.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add +GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add $(top_srcdir)/gcc/base-gfortran.add +GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.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[@]/r $(srcdir)/gcc-sources.add" \ -e "/[@]SOURCES[@]/d" \ - -e "/[@]PREP[@]/r ./gcc-prep.add" \ + -e "/[@]PREP[@]/r $(srcdir)/gcc-prep.add" \ -e "/[@]PREP[@]/d" \ -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)/g" \ @@ -98,6 +98,6 @@ $(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am gcc-sources.add gcc-prep.a CLEANFILES += $(TARGET)-gcc.spec.in @rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in - $(MKSPEC) $(srcdir)/$(TARGET)-gcc.spec.in > $@ + $(MKSPEC) $(TARGET)-gcc.spec.in > $@ CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec -- cgit v1.2.3