aboutsummaryrefslogtreecommitdiff
path: root/package/sdl
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-03-07 13:31:24 +0000
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2008-03-07 13:31:24 +0000
commit5f6726bdfdb141c1a5a750bc4180568601bd07c1 (patch)
treee1fcad7c278d52d9c23c2c78cf7e7e150fc7835b /package/sdl
parent37fd644ab7cfe11fdfb113330c6f96791634f76b (diff)
downloadbuildroot-5f6726bdfdb141c1a5a750bc4180568601bd07c1.tar.gz
buildroot-5f6726bdfdb141c1a5a750bc4180568601bd07c1.tar.bz2
sdl: cleanup configure args + sdl-config, fixup /lib vs /usr/lib
Diffstat (limited to 'package/sdl')
-rw-r--r--package/sdl/sdl.mk18
1 files changed, 4 insertions, 14 deletions
diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk
index eb2dd185bd..f62889d520 100644
--- a/package/sdl/sdl.mk
+++ b/package/sdl/sdl.mk
@@ -55,18 +55,10 @@ $(SDL_DIR)/.configured: $(SDL_DIR)/.unpacked
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
- --prefix=/usr \
+ --prefix=$(STAGING_DIR)/usr \
--exec-prefix=/usr \
- --bindir=/bin \
- --sbindir=/sbin \
- --libdir=/lib \
- --libexecdir=/lib \
--sysconfdir=/etc \
- --datadir=/share \
--localstatedir=/var \
- --includedir=/include \
- --mandir=/man \
- --infodir=/info \
--enable-pulseaudio=no \
--disable-arts \
--disable-esd \
@@ -91,11 +83,9 @@ $(SDL_DIR)/.compiled: $(SDL_DIR)/.configured $(SDL_DIRECTFB_TARGET)
touch $@
$(STAGING_DIR)/usr/lib/libSDL.so: $(SDL_DIR)/.compiled
- $(MAKE) DESTDIR=$(STAGING_DIR)/usr -C $(SDL_DIR) install
- $(SED) "s,^prefix=.*,prefix=\'$(STAGING_DIR)\',g" \
- -e "s,^exec_prefix=.*,exec_prefix=\'$(STAGING_DIR)/usr\',g" \
- -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/lib\',g" \
- -e "s,-I/include/SDL,-I\'$(STAGING_DIR)/include/SDL\',g" \
+ $(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}^' \
$(STAGING_DIR)/usr/bin/sdl-config
touch -c $@