From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Fri, 7 Mar 2008 13:31:24 +0000 (-0000)
Subject: sdl: cleanup configure args + sdl-config, fixup /lib vs /usr/lib
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5f6726bdfdb141c1a5a750bc4180568601bd07c1;p=buildroot.git

sdl: cleanup configure args + sdl-config, fixup /lib vs /usr/lib
---

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 $@