summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2008-03-17 16:39:03 +0000
committerPeter Korsgaard <jacmet@sunsite.dk>2008-03-17 16:39:03 +0000
commit2e5685b3a85b91247de20310e3dae9ebf828ae34 (patch)
treecaf9a103ddeaeffd37058a94c18e1b66a07e6d01
parent7eb796ba2f955c854a427b5f2302d4f976c8fbf2 (diff)
downloadbuildroot-novena-2e5685b3a85b91247de20310e3dae9ebf828ae34.tar.gz
buildroot-novena-2e5685b3a85b91247de20310e3dae9ebf828ae34.zip
sdl: Fix include files install.
Patch sdl-config rpath setting rather than setting exec-prefix and using DESTDIR as the SDL makefile uses prefix for some files, and exec-prefix for others leading to double $(STAGING_DIR) prefix.
-rw-r--r--package/sdl/sdl.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index f62889d52..a11f794f9 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -56,7 +56,6 @@ $(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=$(STAGING_DIR)/usr \
- --exec-prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--enable-pulseaudio=no \
@@ -83,9 +82,9 @@ $(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(SDL_DIRECTFB_TARGET)
touch $@
$(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR) -C $(SDL_DIR) install
-# sdl-config uses -Lexec_prefix/lib instead of -Lprefix/lib - fix it
- $(SED) 's^-L\$${exec_prefix}^-L\$${prefix}^' \
+ $(MAKE) -C $(SDL_DIR) install
+# use correct rpath for linking
+ $(SED) 's^libdir=\$${exec_prefix}^libdir=/usr^' \
$(STAGING_DIR)/usr/bin/sdl-config
touch -c $@