Changeset 29367


Ignore:
Timestamp:
2011-11-30T15:20:59+01:00 (6 years ago)
Author:
blogic
Message:

libupnp: fix example install and improve Makefile

The original Makefile installed libtool wrapper scripts instead of the
real binaries. Increase PKG_RELEASE to trigger rebuild.

Signed-off-by: John Lee <john.cylee@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/libupnp/Makefile

    r26013 r29367  
    1010PKG_NAME:=libupnp 
    1111PKG_VERSION:=1.6.12 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=2 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    5151endef 
    5252 
    53 define Build/Configure 
    54         $(call Build/Configure/Default, \ 
    55                 --enable-shared \ 
    56                 --enable-static \ 
    57         ); 
    58 endef 
    59  
    60 TARGET_CFLAGS += $(FPIC) 
    61  
    62 define Build/Compile/libupnp-sample 
    63         $(MAKE) -C $(PKG_BUILD_DIR) \ 
    64                 DESTDIR="$(PKG_INSTALL_DIR)" \ 
    65                 check 
    66         $(MAKE) -C $(PKG_BUILD_DIR)/upnp/sample \ 
    67                 DESTDIR="$(PKG_INSTALL_DIR)" \ 
    68                 upnp_tv_device upnp_tv_ctrlpt 
    69 endef 
    70  
    7153define Build/InstallDev 
    7254        $(INSTALL_DIR) $(1)/usr/include 
     
    8567define Package/libupnp-sample/install 
    8668        $(INSTALL_DIR) $(1)/usr/bin 
    87         $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_device $(1)/usr/bin 
    88         $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_ctrlpt $(1)/usr/bin 
     69        $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/.libs/* $(1)/usr/bin 
    8970        $(INSTALL_DIR) $(1)/etc/upnp-tvdevice/web 
    90         $(CP) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice 
     71        $(INSTALL_DATA) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice 
    9172endef 
    9273 
Note: See TracChangeset for help on using the changeset viewer.