Preps for VPATH builts.

2 files changed, 35 insertions, 35 deletions

diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am
index 0c9f45ad53..6ad504ce1a 100644
--- a/contrib/crossrpms/freebsd5.2/Makefile.am
+++ b/contrib/crossrpms/freebsd5.2/Makefile.am
@@ -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
 
@@ -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
 
@@ -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
diff --git a/contrib/crossrpms/freebsd6.0/Makefile.am b/contrib/crossrpms/freebsd6.0/Makefile.am
index ee231a2b14..2fe3c093ad 100644
--- a/contrib/crossrpms/freebsd6.0/Makefile.am
+++ b/contrib/crossrpms/freebsd6.0/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 += $(top_srcdir)/freebsd6.0/libs.add
+LIBS_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add
+LIBS_SUBPACKAGES += $(top_srcdir)/common/clean.add
+LIBS_SUBPACKAGES += $(top_srcdir)/freebsd6.0/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