changed cp for $(CP), reverted wrong package/config/Makefile CP

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

diff --git a/openwrt/package/matrixssl/Makefile b/openwrt/package/matrixssl/Makefile
index 0b08e22..89bd39a 100644 (file)
--- a/openwrt/package/matrixssl/Makefile
+++ b/openwrt/package/matrixssl/Makefile
@@ -7,8 +7,7 @@ PKG_VERSION:=1.2.4
 PKG_RELEASE:=1
 PKG_MD5SUM:=771c1489488e62668d673478311d63ca
 
-PKG_SOURCE_URL:=http://nbd.vd-s.ath.cx/openwrt \
-       http://openwrt.openbsd-geek.de/
+PKG_SOURCE_URL:=http://nbd.vd-s.ath.cx/openwrt
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -19,24 +18,27 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,LIBMATRIXSSL,libmatrixssl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.built:
+$(PKG_BUILD_DIR)/.configured:
+       touch $@
+
+$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
        $(MAKE) -C $(PKG_BUILD_DIR)/src \
                $(TARGET_CONFIGURE_OPTS) \
                DFLAGS="$(TARGET_CFLAGS) -Wall"
-       touch $(PKG_BUILD_DIR)/.built
+       touch $@
 
 $(IPKG_LIBMATRIXSSL):
        install -d -m0755 $(IDIR_LIBMATRIXSSL)/usr/lib
-       cp -fpR $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(IDIR_LIBMATRIXSSL)/usr/lib/
+       $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so.* $(IDIR_LIBMATRIXSSL)/usr/lib/
        $(RSTRIP) $(IDIR_LIBMATRIXSSL)
        $(IPKG_BUILD) $(IDIR_LIBMATRIXSSL) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libmatrixssl.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/include/matrixSsl
-       cp -fpR $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl
+       $(CP) $(PKG_BUILD_DIR)/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl
        ln -sf matrixSsl/matrixSsl.h $(STAGING_DIR)/usr/include/matrixSsl.h
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp -fpR $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/usr/lib
+       $(CP) $(PKG_BUILD_DIR)/src/libmatrixssl.so* $(STAGING_DIR)/usr/lib
 
 install-dev: $(STAGING_DIR)/usr/lib/libmatrixssl.so
 
@@ -45,5 +47,5 @@ uninstall-dev:
          $(STAGING_DIR)/usr/include/matrixSsl* \
          $(STAGING_DIR)/usr/lib/libmatrixssl.so* \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev