diff options
| author |   Michal Marek <mmarek@suse.cz> | 2014-06-18 17:15:17 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2014-06-18 19:21:42 +0200 |
| commit | a981296f048b99b0d5bb4d87c732a6cfb35a1c66 (patch) | |
| tree | 259dc71da9737034ef7f352cafb66d4724fa8331 /Documentation | |
| parent | kbuild: Fix tar-pkg with relative $(objtree) (diff) | |
| download | linux-dev-a981296f048b99b0d5bb4d87c732a6cfb35a1c66.tar.xz linux-dev-a981296f048b99b0d5bb4d87c732a6cfb35a1c66.zip | |
Documentation: Fix DocBook build with relative $(srctree)
After commits 890676c6 (kbuild: Use relative path when building in the source
tree) and 9da0763b (kbuild: Use relative path when building in a subdir
of the source tree), the $(srctree) variable can be a relative path.
This breaks Documentation/DocBook/media/Makefile, because it tries to
create symlinks from a subdirectory of the object tree to the source
tree. Fix this by using a full path in this case.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/media/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile index 1d27f0a1abd1..639e74857968 100644 --- a/Documentation/DocBook/media/Makefile +++ b/Documentation/DocBook/media/Makefile @@ -202,8 +202,8 @@ $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64 $(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES) @$($(quiet)gen_xml) - @(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/) - @(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/) + @(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/v4l/*xml $(MEDIA_OBJ_DIR)/) + @(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/dvb/*xml $(MEDIA_OBJ_DIR)/) $(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml @$($(quiet)gen_xml) |