fix static domain wildcards in dnsmasq (broken by upgrade to 2.26)

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

diff --git a/openwrt/package/libogg/Makefile b/openwrt/package/libogg/Makefile
index 4841423..4459aa2 100644 (file)
--- a/openwrt/package/libogg/Makefile
+++ b/openwrt/package/libogg/Makefile
@@ -62,18 +62,18 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBOGG):
        install -m0755 -d $(IDIR_LIBOGG)/usr/lib
 
 $(IPKG_LIBOGG):
        install -m0755 -d $(IDIR_LIBOGG)/usr/lib

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.so.* $(IDIR_LIBOGG)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libogg.so.* $(IDIR_LIBOGG)/usr/lib/

        $(RSTRIP) $(IDIR_LIBOGG)
        $(IPKG_BUILD) $(IDIR_LIBOGG) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libogg.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include
        $(RSTRIP) $(IDIR_LIBOGG)
        $(IPKG_BUILD) $(IDIR_LIBOGG) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libogg.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include

-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/ogg $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/ogg $(STAGING_DIR)/usr/include/

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

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.a $(STAGING_DIR)/usr/lib/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libogg.so* $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libogg.a $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libogg.so* $(STAGING_DIR)/usr/lib/

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

-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ogg.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ogg.pc $(STAGING_DIR)/usr/lib/pkgconfig/

        $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc
        $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc
        touch $@
        $(SED) 's,-I$${includedir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc
        $(SED) 's,-L$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc
        touch $@


@@ -87,8 +87,8 @@ uninstall-dev:
                $(STAGING_DIR)/usr/lib/libogg.so* \
                $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc \
 
                $(STAGING_DIR)/usr/lib/libogg.so* \
                $(STAGING_DIR)/usr/lib/pkgconfig/ogg.pc \
 

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

 
 mostlyclean:
        -$(MAKE) -C $(PKG_BUILD_DIR) clean
 
 mostlyclean:
        -$(MAKE) -C $(PKG_BUILD_DIR) clean