From: John Kacur <jkacur@redhat.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Darren Hart <dvhltc@us.ibm.com>,
lkml <linux-kernel@vger.kernel.org>,
John Kacur <jkacur@redhat.com>
Subject: [PATCH 2/2] trace-cmd: Makefile - use a substitution reference
Date: Wed, 9 Jun 2010 18:01:28 +0200 [thread overview]
Message-ID: <1276099288-3029-3-git-send-email-jkacur@redhat.com> (raw)
In-Reply-To: <1276099288-3029-1-git-send-email-jkacur@redhat.com>
subst will substitution every occurence of a string with another.
What we want here is just to substitute the last occurence.
That is we want to transform files that end with .1 into .1.install
We do not want to transform every ".1" in a path name into .1.install.
Without this fix you can get errors of this nature.
make prefix=/home/jkacur/rpmbuild/BUILDROOT/trace-cmd-1.0.1-4.fc12.x86_64/usr install_doc
make -C /home/jkacur/rpmbuild/BUILD/trace-cmd-1.0.1/Documentation install
make[1]: *** No rule to make target `/home/jkacur/rpmbuild/BUILD/trace-cmd-1.0.1.install/Documentation/trace-cmd.1', needed by `/home/jkacur/rpmbuild/BUILD/trace-cmd-1.0.1.install/Documentation/trace-cmd.1.install'. Stop.
make: *** [install_doc] Error 2
Signed-off-by: John Kacur <jkacur@redhat.com>
Use a "substitution reference" instead of a substitution.
A "subst" will change every occurence of a string
---
Documentation/Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 7ed8877..d161703 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -77,8 +77,8 @@ define do_install
$(INSTALL) $1 $2;
endef
-MAN1_INSTALL = $(subst .1,.1.install,$(MAN1))
-MAN5_INSTALL = $(subst .5,.5.install,$(MAN5))
+MAN1_INSTALL = $(MAN1:%.1=%.1.install)
+MAN5_INSTALL = $(MAN5:%.5=%.5.install)
$(MAN1_INSTALL): %.1.install : %.1 force
$(Q)$(call do_install, $<, '$(man_dir_SQ)/man1')
@@ -92,4 +92,4 @@ clean:
$(RM) *.xml *.xsl *.1 *.5)
.PHONE: force
-force:
\ No newline at end of file
+force:
--
1.6.6.1
prev parent reply other threads:[~2010-06-09 16:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-09 16:01 [PATCH 0/2] trace-cmd, kernel analysis tool Makefile changes John Kacur
2010-06-09 16:01 ` [PATCH 1/2] trace-cmd: Makefile - EXTRAVERSION should be set without a leading period John Kacur
2010-06-09 16:01 ` John Kacur [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1276099288-3029-3-git-send-email-jkacur@redhat.com \
--to=jkacur@redhat.com \
--cc=dvhltc@us.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®