diff options
Diffstat (limited to 'v4l')
| -rw-r--r-- | v4l/ChangeLog | 7 | ||||
| -rw-r--r-- | v4l/Makefile | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 2ef9ab1d0..f06721d3f 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,10 @@ +2005-10-09 21:18 mkrufky + + * ../v4l/Makefile: + - don't symlink linux/include to v4l/ in merged-tree environment. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + 2005-10-09 21:04 mkrufky * ../v4l/scripts/merge-trees.sh: diff --git a/v4l/Makefile b/v4l/Makefile index 02eead390..c81c99c0c 100644 --- a/v4l/Makefile +++ b/v4l/Makefile @@ -171,7 +171,7 @@ links:: @find ../linux/kernel/drivers/usb/media -name '*.[c,h]' -type f -exec ln -sf '{}' . \; # for merged-trees: - @find ../linux -name '*.[c,h]' -type l -exec ln -sf '{}' . \; + @find ../linux/drivers -name '*.[c,h]' -type l -exec ln -sf '{}' . \; # @find ../linux/include -name '*.[h]' -type f -exec ln -sf '{}' . \; |