fix a dependency bug introduced by [2333]

[openwrt.git] / package / libosip2 / Makefile

diff --git a/package/libosip2/Makefile b/package/libosip2/Makefile
index d7a504a..65a5283 100644 (file)
--- a/package/libosip2/Makefile
+++ b/package/libosip2/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libosip2
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libosip2

-PKG_VERSION:=2.0.9
+PKG_VERSION:=2.2.0

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=dba6d47332f4842f70694792939fec2d
+PKG_MD5SUM:=f1237af0250c59b318bd64a59f5750ea

 
 PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/osip/ \
        ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/osip/ \
 
 PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/osip/ \
        ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/osip/ \


@@ -26,7 +26,7 @@ $(PKG_BUILD_DIR)/.configured:
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(strip $(TARGET_CFLAGS))" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(strip $(TARGET_CFLAGS))" \
                CPPFLAGS="-I$(STAGING_DIR)/usr/include" \

-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+               LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \

                ./configure \
                  --target=$(GNU_TARGET_NAME) \
                  --host=$(GNU_TARGET_NAME) \
                ./configure \
                  --target=$(GNU_TARGET_NAME) \
                  --host=$(GNU_TARGET_NAME) \


@@ -76,7 +76,9 @@ $(STAGING_DIR)/usr/lib/libosip2.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
        mkdir -p $(STAGING_DIR)/usr/include
        cp -fpR $(PKG_INSTALL_DIR)/usr/include/osip{,parser}2 $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib

-       cp -fp $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libosip{,parser}2.{a,so*} $(STAGING_DIR)/usr/lib/
+       mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
+       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libosip2.pc $(STAGING_DIR)/usr/lib/pkgconfig/

        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libosip2.so
        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libosip2.so


@@ -85,6 +87,7 @@ uninstall-dev:
        rm -rf \
                $(STAGING_DIR)/usr/include/osip{,parser}2 \
                $(STAGING_DIR)/usr/lib/libosip{,parser}2.{a,so*} \
        rm -rf \
                $(STAGING_DIR)/usr/include/osip{,parser}2 \
                $(STAGING_DIR)/usr/lib/libosip{,parser}2.{a,so*} \

+               $(STAGING_DIR)/usr/lib/pkgconfig/libosip2.pc \

 
 

-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev