linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Documentation: fix DOCBOOKS=... building
@ 2012-06-13  8:43 Johannes Berg
  2012-07-27 22:29 ` Randy Dunlap
  0 siblings, 1 reply; 8+ messages in thread
From: Johannes Berg @ 2012-06-13  8:43 UTC (permalink / raw)
  To: Randy Dunlap; +Cc: LKML, Mauro Carvalho Chehab

From: Johannes Berg <johannes.berg@intel.com>

Prior to 
commit 4266129964b8238526936d723de65b419d8069c6
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date:   Tue May 31 16:27:44 2011 -0300

    [media] DocBook: Move all media docbook stuff into its own directory

it was possible to build only a single (or more)
book(s) by calling, for example
	make htmldocs DOCBOOKS=80211.xml

This now fails:
cp: target `.../Documentation/DocBook//media_api' is not a directory

Ignore errors from that copy to make this possible again.

Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
I complained about this a long time ago, but now it finally bothered me
enough to fix it ... :-)

 Documentation/DocBook/media/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/Documentation/DocBook/media/Makefile	2012-06-13 10:39:58.000000000 +0200
+++ b/Documentation/DocBook/media/Makefile	2012-06-13 10:40:05.000000000 +0200
@@ -195,7 +195,7 @@ DVB_DOCUMENTED = \
 #
 
 install_media_images = \
-	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
+	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
 
 $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64
 	$(Q)base64 -d $< >$@



^ permalink raw reply	[flat|nested] 8+ messages in thread
* [PATCH] Documentation: fix DOCBOOKS=... building
@ 2014-05-20 13:12 Johannes Berg
  0 siblings, 0 replies; 8+ messages in thread
From: Johannes Berg @ 2014-05-20 13:12 UTC (permalink / raw)
  To: Andrew Morton
  Cc: linux-kernel, Mauro Carvalho Chehab, Randy Dunlap, Johannes Berg

From: Johannes Berg <johannes.berg@intel.com>

Prior to
commit 4266129964b8238526936d723de65b419d8069c6
Author: Mauro Carvalho Chehab <mchehab@redhat.com>
Date:   Tue May 31 16:27:44 2011 -0300

    [media] DocBook: Move all media docbook stuff into its own directory

it was possible to build only a single (or more)
book(s) by calling, for example
	make htmldocs DOCBOOKS=80211.xml

This now fails:
cp: target `.../Documentation/DocBook//media_api' is not a directory

Ignore errors from that copy to make this possible again.

Fixes: 4266129964b8 ("[media] DocBook: Move all media docbook stuff into its own directory")
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
Both Rand and I sent this patch almost a year ago, but it didn't stick.
Can somebody please take it? :-)

Thanks,
johannes
---
 Documentation/DocBook/media/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
index f9fd615427fb..1d27f0a1abd1 100644
--- a/Documentation/DocBook/media/Makefile
+++ b/Documentation/DocBook/media/Makefile
@@ -195,7 +195,7 @@ DVB_DOCUMENTED = \
 #
 
 install_media_images = \
-	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
+	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api
 
 $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64
 	$(Q)base64 -d $< >$@
-- 
2.0.0.rc0


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2014-05-20 13:12 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-13  8:43 [PATCH] Documentation: fix DOCBOOKS=... building Johannes Berg
2012-07-27 22:29 ` Randy Dunlap
2012-07-28 11:26   ` Johannes Berg
2012-07-28 15:05     ` Randy Dunlap
2012-07-28 16:48       ` Johannes Berg
2012-07-29  0:33       ` Rob Landley
2012-07-30  0:16         ` Mauro Carvalho Chehab
  -- strict thread matches above, loose matches on Subject: below --
2014-05-20 13:12 Johannes Berg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).