| From e60cbeedc48d80689c249ab5dcc3c31ad0452dea Mon Sep 17 00:00:00 2001 |
| From: Johannes Berg <johannes.berg@intel.com> |
| Date: Thu, 22 May 2014 11:54:23 -0700 |
| Subject: Documentation: fix DOCBOOKS=... building |
| |
| From: Johannes Berg <johannes.berg@intel.com> |
| |
| commit e60cbeedc48d80689c249ab5dcc3c31ad0452dea upstream. |
| |
| Prior to commit 4266129964b8 ("[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") |
| Signed-off-by: Johannes Berg <johannes.berg@intel.com> |
| Acked-by: Randy Dunlap <rdunlap@xenotime.net> |
| Cc: Mauro Carvalho Chehab <mchehab@redhat.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| Documentation/DocBook/media/Makefile | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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 $< >$@ |
