From fb0ca69fe47f3dd4f2de96bfd20d0bce5a789b2a Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Mon, 11 Mar 2013 10:35:27 +0100 Subject: [PATCH] libports: make include paths absolute If contrib and/or download in libports are symlinks, then using ".." ends up in the wrong directory. Use CURDIR variable set by make. --- libports/ports/ffat.mk | 2 +- libports/ports/libav.mk | 2 +- libports/ports/sdl.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libports/ports/ffat.mk b/libports/ports/ffat.mk index 48631b76b..fccfbce35 100644 --- a/libports/ports/ffat.mk +++ b/libports/ports/ffat.mk @@ -41,7 +41,7 @@ $(CONTRIB_DIR)/$(FFAT): $(DOWNLOAD_DIR)/$(FFAT_ZIP) include/ffat $(VERBOSE)for i in $(FFAT_HEADERS); do \ ln -sf ../../$(CONTRIB_DIR)/$(FFAT)/src/$$i include/ffat/; done $(VERBOSE)rm $(addprefix $(CONTRIB_DIR)/$(FFAT)/src/,$(FFAT_DELETE)) - $(VERBOSE)patch -d $(CONTRIB_DIR)/$(FFAT) -p1 -i ../../src/lib/ffat/config.patch + $(VERBOSE)patch -d $(CONTRIB_DIR)/$(FFAT) -p1 -i $(CURDIR)/src/lib/ffat/config.patch clean-ffat: $(VERBOSE)rm -f $(addprefix include/ffat/,$(FFAT_HEADERS)) diff --git a/libports/ports/libav.mk b/libports/ports/libav.mk index 19dd31728..cdc2476e7 100644 --- a/libports/ports/libav.mk +++ b/libports/ports/libav.mk @@ -20,7 +20,7 @@ $(DOWNLOAD_DIR)/$(LIBAV_TGZ): $(CONTRIB_DIR)/$(LIBAV): $(DOWNLOAD_DIR)/$(LIBAV_TGZ) $(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) && touch $@ - $(VERBOSE)patch -d $(CONTRIB_DIR)/$(LIBAV) -p1 -i ../../src/app/avplay/avplay.patch + $(VERBOSE)patch -d $(CONTRIB_DIR)/$(LIBAV) -p1 -i $(CURDIR)/src/app/avplay/avplay.patch clean-libav: $(VERBOSE)rm -rf $(CONTRIB_DIR)/$(LIBAV) diff --git a/libports/ports/sdl.mk b/libports/ports/sdl.mk index ab7df4bf4..dfcebb0f2 100644 --- a/libports/ports/sdl.mk +++ b/libports/ports/sdl.mk @@ -25,7 +25,7 @@ $(CONTRIB_DIR)/$(SDL): $(DOWNLOAD_DIR)/$(SDL_TGZ) $(VERBOSE)tar xfz $< -C $(CONTRIB_DIR) && touch $@ $(VERBOSE)rm -f $@/include/SDL_config.h $(VERBOSE)patch -p0 -i src/lib/sdl/SDL_video.patch - $(VERBOSE)patch -d $(CONTRIB_DIR)/$(SDL) -p1 -i ../../src/lib/sdl/SDL_audio.patch + $(VERBOSE)patch -d $(CONTRIB_DIR)/$(SDL) -p1 -i $(CURDIR)/src/lib/sdl/SDL_audio.patch # # Install SDL headers