only remove gd stuff on UninstallDev (broke libgdbm)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@4896 3c298f89-4303-0410-b956-a3cf2f4a3e73

libs/gd/Makefile

@@ -12,12 +12,12 @@ PKG_NAME:=gd
 PKG_VERSION:=2.0.33
 PKG_RELEASE:=2
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.boutell.com/gd/http
 PKG_MD5SUM:=be0a6d326cd8567e736fbc75df0a5c45
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -27,78 +27,53 @@ define Package/libgd
   CATEGORY:=Libraries
   DEPENDS:=+libjpeg +libpng
   TITLE:=The GD graphics library
-  DESCRIPTION:=The GD graphics library.
   URL:=http://www.boutell.com/gd/
 endef
 
 define Build/Configure
-	(cd $(PKG_BUILD_DIR); rm -f config.cache; \
+	$(call Build/Configure/Default, \
-		$(TARGET_CONFIGURE_OPTS) \
+		--enable-shared \
-		CFLAGS="$(TARGET_CFLAGS)" \
+		--enable-static \
-		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		--disable-rpath \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		--with-gnu-ld \
+		--without-x \
+		--without-freetype \
+		--with-jpeg=$(STAGING_DIR)/usr \
+		--with-png=$(STAGING_DIR)/usr \
+		--without-xpm \
+		, \
 		LIBPNG12_CONFIG="$(STAGING_DIR)/usr/bin/libpng12-config" \
-		./configure \
+	)
-			--target=$(GNU_TARGET_NAME) \
-			--host=$(GNU_TARGET_NAME) \
-			--build=$(GNU_HOST_NAME) \
-			--program-prefix="" \
-			--program-suffix="" \
-			--prefix=/usr \
-			--exec-prefix=/usr \
-			--bindir=/usr/bin \
-			--datadir=/usr/share \
-			--includedir=/usr/include \
-			--infodir=/usr/share/info \
-			--libdir=/usr/lib \
-			--libexecdir=/usr/lib \
-			--localstatedir=/var \
-			--mandir=/usr/share/man \
-			--sbindir=/usr/sbin \
-			--sysconfdir=/etc \
-			$(DISABLE_LARGEFILE) \
-			$(DISABLE_NLS) \
-			--enable-shared \
-			--enable-static \
-			--disable-rpath \
-			--with-gnu-ld \
-			--without-x \
-			--without-freetype \
-			--with-jpeg=$(STAGING_DIR)/usr \
-			--with-png=$(STAGING_DIR)/usr \
-			--without-xpm \
-	);
 endef
 
 define Build/Compile
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 endef
 
-define Package/libgd/install
-	install -d -m0755 $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
 	mkdir -p $(STAGING_DIR)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/gdlib-config $(STAGING_DIR)/usr/bin/
 	mkdir -p $(STAGING_DIR)/usr/include
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/entities.h $(STAGING_DIR)/usr/include/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/gd*.h $(STAGING_DIR)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/gd{,_io,cache,fontg,fontl,fontmb,fonts,fontt,fx}.h \
+		$(STAGING_DIR)/usr/include/
 	mkdir -p $(STAGING_DIR)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.{a,so*} $(STAGING_DIR)/usr/lib/
+	$(SED) 's,-I$$$${prefix}/include,,g' $(STAGING_DIR)/usr/bin/gdlib-config
 endef
 
 define Build/UninstallDev
-	rm -rf \
+	rm -rf	$(STAGING_DIR)/usr/bin/gdlib-config \
-		$(STAGING_DIR)/usr/bin/gdlib-config \
 		$(STAGING_DIR)/usr/include/entities.h \
-		$(STAGING_DIR)/usr/include/gd*.h \
+		$(STAGING_DIR)/usr/include/gd{,_io,cache,fontg,fontl,fontmb,fonts,fontt,fx}.h \
 		$(STAGING_DIR)/usr/lib/libgd.{a,so*}
 endef
 
+define Package/libgd/install
+	install -d -m0755 $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgd.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libgd))