From 9689409548398050056cdd2c8367b5e05c92c03c Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 17 Feb 2006 15:12:06 +0000 Subject: [PATCH] Use libs.add target-libs.add --- contrib/crossrpms/freebsd5.2/Makefile.am | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/contrib/crossrpms/freebsd5.2/Makefile.am b/contrib/crossrpms/freebsd5.2/Makefile.am index e0e1bcc241..ce88f559f0 100644 --- a/contrib/crossrpms/freebsd5.2/Makefile.am +++ b/contrib/crossrpms/freebsd5.2/Makefile.am @@ -8,15 +8,25 @@ CLEANFILES = FREEBSD_VERS = 5.2.1 FREEBSD_RPMREL = 0.20060209.1 -$(TARGET)-libs.spec: libs.spec.in - sed -e "/[@]INSTALL_POST[@]/r ../common/installpost.add" \ - -e "/[@]INSTALL_POST[@]/d" \ - -e "/[@]FIND_REQPROV[@]/r ../common/find-reqprov.add" \ - -e "/[@]FIND_REQPROV[@]/d" \ - -e "s/[@]tool_target[@]/$(TARGET)/g" \ +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 + +$(TARGET)-libs.spec.in: $(LIBS_SUBPACKAGES) + cat $(LIBS_SUBPACKAGES) | sed \ + -e "s,[@]_prefix[@],$(prefix),g" \ + -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ + > $(TARGET)-libs.spec.in +CLEANFILES += $(TARGET)-libs.spec.in + +$(TARGET)-libs.spec: $(TARGET)-libs.spec.in + sed \ + -e "s/@tool_target@/$(TARGET)/g" \ -e "s/[@]FREEBSD_VERS[@]/$(FREEBSD_VERS)/g" \ -e "s/[@]FREEBSD_RPMREL[@]/$(FREEBSD_RPMREL)/g" \ - $(srcdir)/libs.spec.in > $@ + $(srcdir)/$(TARGET)-libs.spec.in > $@ CLEANFILES += $(TARGET)-libs.spec noinst_DATA += $(TARGET)-libs.spec