fix package name

[openwrt.git] / package / libgd / Makefile

diff --git a/package/libgd/Makefile b/package/libgd/Makefile
index 50ca47f..1f0776f 100644 (file)
--- 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