X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Flibgd%2FMakefile;h=1f0776f046fd2748e907a6db8fb86c86b2e90e32;hb=1b1e5a1652997ccd111a90f49dcb05158b4064e9;hp=50ca47f801b7dadc6cacd503858bc902ef96c4cd;hpb=d2368294409098f0d160f5cf432c149aa3bd858f;p=openwrt-10.03%2F.git

diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index 50ca47f80..1f0776f04 100644
--- a/package/libgd/Makefile
+++ b/package/libgd/Makefile
@@ -23,10 +23,8 @@ $(PKG_BUILD_DIR)/.configured:
 		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
 		LIBPNG12_CONFIG="$(STAGING_DIR)/usr/bin/libpng12-config" \
-		sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
-		sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
 		./configure \
 		  --target=$(GNU_TARGET_NAME) \
 		  --host=$(GNU_TARGET_NAME) \
@@ -51,6 +49,7 @@ $(PKG_BUILD_DIR)/.configured:
 		  --enable-static \
 		  --disable-rpath \
 		  --without-x \
+		  --without-freetype \
 		  --with-png=$(STAGING_DIR)/usr \
 	)
 	touch $@
@@ -77,14 +76,16 @@ $(STAGING_DIR)/usr/lib/libgd.so: $(PKG_BUILD_DIR)/.built
 	cp -fpR $(PKG_INSTALL_DIR)/usr/include/gd*.h $(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
 	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(STAGING_DIR)/usr/lib/
+	touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libgd.so
 
 uninstall-dev:
 	rm -rf \
-	  $(STAGING_DIR)/usr/include/entities.h \
-	  $(STAGING_DIR)/usr/include/gd*.h \
-	  $(STAGING_DIR)/usr/lib/libgd.{a,so*}
+		$(STAGING_DIR)/usr/bin/gdlib-config \
+		$(STAGING_DIR)/usr/include/entities.h \
+		$(STAGING_DIR)/usr/include/gd*.h \
+		$(STAGING_DIR)/usr/lib/libgd.{a,so*} \
 
 compile: install-dev
 clean: uninstall-dev