[packages] libmad: fix build failure on targets using -O2 optimizations (partially...

[packages.git] / libs / cgilib / Makefile

diff --git a/libs/cgilib/Makefile b/libs/cgilib/Makefile
index 5be5eec..f52e26d 100644 (file)
--- a/libs/cgilib/Makefile
+++ b/libs/cgilib/Makefile
@@ -1,23 +1,22 @@
 #
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cgilib
-PKG_VERSION:=0.5
+PKG_VERSION:=0.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://www.infodrom.org/projects/cgilib/download
-PKG_MD5SUM:=5187ba11b2ec165b6c5b6629087733b0
-PKG_CAT:=zcat
+PKG_MD5SUM:=2c7053f58dfb06f7a80a112797ed7e86
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP:=libtool
+LIBTOOL="$(STAGING_DIR)/host/bin/libtool"
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,32 +27,27 @@ define Package/cgilib
   URL:=http://www.infodrom.org/projects/cgilib/
 endef
 
-define Build/Configure
-endef
+TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                 OFLAGS="$(TARGET_CFLAGS)" \
-                all
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               LIBTOOL="$(LIBTOOL)" \
+                install
 endef
 
 define Build/InstallDev
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_BUILD_DIR)/cgi.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/libcgi.{a,so*} $(STAGING_DIR)/usr/lib/
-endef
-       
-define Build/UninstallDev
-       rm -rf \
-               $(STAGING_DIR)/usr/include/cgi.h \
-               $(STAGING_DIR)/usr/lib/libcgi.{a,so*}
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/cgi.h $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcgi.{a,so*} $(1)/usr/lib/
 endef
 
 define Package/cgilib/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_BUILD_DIR)/libcgi.so.* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcgi.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,cgilib))