fix broken openser menuconfig and package template call

[openwrt.git] / openwrt / package / libupnp / Makefile

diff --git a/openwrt/package/libupnp/Makefile b/openwrt/package/libupnp/Makefile
index 88c48e7..6e86272 100644 (file)
--- a/openwrt/package/libupnp/Makefile
+++ b/openwrt/package/libupnp/Makefile
@@ -21,7 +21,7 @@ $(eval $(call PKG_template,LIBUPNP,libupnp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)
 $(PKG_BUILD_DIR)/.configured:
        touch $@
 
 $(PKG_BUILD_DIR)/.configured:
        touch $@
 

-$(PKG_BUILD_DIR)/.built:
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured

        $(MAKE) -C $(PKG_BUILD_DIR)/upnp \
                $(TARGET_CONFIGURE_OPTS) \
                OPT_FLAGS="$(TARGET_CFLAGS)" \
        $(MAKE) -C $(PKG_BUILD_DIR)/upnp \
                $(TARGET_CONFIGURE_OPTS) \
                OPT_FLAGS="$(TARGET_CFLAGS)" \


@@ -30,19 +30,19 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBUPNP):
        install -m0755 -d $(IDIR_LIBUPNP)/usr/lib
 
 $(IPKG_LIBUPNP):
        install -m0755 -d $(IDIR_LIBUPNP)/usr/lib

-       cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(IDIR_LIBUPNP)/usr/lib/ ; \
-       cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(IDIR_LIBUPNP)/usr/lib/ ; \
-       cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(IDIR_LIBUPNP)/usr/lib/ ; \
+       $(CP) $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(IDIR_LIBUPNP)/usr/lib/ ; \
+       $(CP) $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(IDIR_LIBUPNP)/usr/lib/ ; \
+       $(CP) $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(IDIR_LIBUPNP)/usr/lib/ ; \

        $(RSTRIP) $(IDIR_LIBUPNP)
        $(IPKG_BUILD) $(IDIR_LIBUPNP) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libupnp.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include/upnp
        $(RSTRIP) $(IDIR_LIBUPNP)
        $(IPKG_BUILD) $(IDIR_LIBUPNP) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libupnp.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include/upnp

-       cp -fpR $(PKG_BUILD_DIR)/upnp/inc/*.h $(STAGING_DIR)/usr/include/upnp/
+       $(CP) $(PKG_BUILD_DIR)/upnp/inc/*.h $(STAGING_DIR)/usr/include/upnp/

        mkdir -p $(STAGING_DIR)/usr/lib
        mkdir -p $(STAGING_DIR)/usr/lib

-       cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(STAGING_DIR)/usr/lib/ ; \
-       cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(STAGING_DIR)/usr/lib/ ; \
-       cp -fpR $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(STAGING_DIR)/usr/lib/ ; \
+       $(CP) $(PKG_BUILD_DIR)/upnp/bin/libixml.so $(STAGING_DIR)/usr/lib/ ; \
+       $(CP) $(PKG_BUILD_DIR)/upnp/bin/libthreadutil.so $(STAGING_DIR)/usr/lib/ ; \
+       $(CP) $(PKG_BUILD_DIR)/upnp/bin/libupnp.so $(STAGING_DIR)/usr/lib/ ; \

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


@@ -54,5 +54,5 @@ uninstall-dev:
                $(STAGING_DIR)/usr/lib/libthreadutil.so \
                $(STAGING_DIR)/usr/lib/libupnp.so \
 
                $(STAGING_DIR)/usr/lib/libthreadutil.so \
                $(STAGING_DIR)/usr/lib/libupnp.so \
 

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