[packages] libnetfilter-queue: remove private libtool copy

[openwrt/svn-archive/archive.git] / libs / glib / Makefile

diff --git a/libs/glib/Makefile b/libs/glib/Makefile
index 6abd85edb8191b32135270e547ab062c18fdd67e..7b7018036d57fd8ea44ac459ae8a7c42e66963d0 100644 (file)
--- a/libs/glib/Makefile
+++ b/libs/glib/Makefile
@@ -4,7 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -19,7 +18,8 @@ PKG_SOURCE_URL:=ftp://ftp.gtk.org/pub/gtk/v1.2 \
        http://www.mirrorservice.org/sites/ftp.gimp.org/pub/gtk/v1.2/
 PKG_MD5SUM:=6fe30dad87c77b91b632def29dd69ef9
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -36,6 +36,9 @@ define Package/glib1/description
  as trees, hashes, and lists.
 endef
 
+TARGET_CFLAGS += $(FPIC)
+TARGET_LDFLAGS += -L$(TOOLCHAIN_DIR)/lib
+
 CONFIGURE_ARGS += \
        --enable-shared \
        --enable-static \
@@ -56,20 +59,15 @@ CONFIGURE_VARS += \
        glib_cv_sizeof_gmutex=24 \
        glib_cv_byte_contents_gmutex="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" \
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
-endef
-
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)
+       $(INSTALL_DIR) $(1) $(2)/bin
        $(CP) $(PKG_INSTALL_DIR)/* $(1)/
        $(CP) $(PKG_BUILD_DIR)/.libs/*.a $(PKG_BUILD_DIR)/*/.libs/*.a $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/glibconfig-sysdefs.h $(1)/usr/include/glib-1.2/
-       $(INSTALL_DIR) $(2)/bin
-       mv $(1)/usr/bin/glib-config $(2)/bin/
-       $(SED) 's,-I$$$${prefix}/include/glib,-I$(1)/usr/include/glib,g' $(2)/bin/glib-config
-       $(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(1)/usr/lib/glib,g' $(2)/bin/glib-config
-       $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(2)/bin/glib-config
+       ln -sf $(STAGING_DIR)/usr/bin/glib-config $(2)/bin/
+       $(SED) 's,-I$$$${prefix}/include/glib,-I$(STAGING_DIR)/usr/include/glib,g' $(1)/usr/bin/glib-config
+       $(SED) 's,-I$$$${exec_prefix}/lib/glib,-I$(STAGING_DIR)/usr/lib/glib,g' $(1)/usr/bin/glib-config
+       $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/glib-config
 endef
 
 define Package/glib1/install