diff options
author | Johannes Berg <johannes.berg@intel.com> | 2014-05-22 11:54:23 -0700 |
---|---|---|
committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-20 17:33:53 +0200 |
commit | 4552eb241957702f9bc1309dba4d936629c5f0c7 (patch) | |
tree | 2b0edee2ec7d50eb9db2c263940f210f687d3e18 /Documentation | |
parent | 191df2f25cf91a4e3adeb3e230d3323e7f1b6606 (diff) | |
download | linux-stable-4552eb241957702f9bc1309dba4d936629c5f0c7.tar.gz linux-stable-4552eb241957702f9bc1309dba4d936629c5f0c7.tar.bz2 linux-stable-4552eb241957702f9bc1309dba4d936629c5f0c7.zip |
Documentation: fix DOCBOOKS=... building
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: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/DocBook/media/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 $< >$@ |