let ipkg fail when a package file to be installed is not found

[openwrt.git] / openwrt / package / libgpg-error / Makefile

diff --git a/openwrt/package/libgpg-error/Makefile b/openwrt/package/libgpg-error/Makefile
index 4b305ea..eb127d3 100644 (file)
--- a/openwrt/package/libgpg-error/Makefile
+++ b/openwrt/package/libgpg-error/Makefile
@@ -7,7 +7,10 @@ PKG_VERSION:=1.0
 PKG_RELEASE:=0
 PKG_MD5SUM:=ff409db977e4a4897aa09ea420a28a2f
 
-PKG_SOURCE_URL:=@GNU/$(PKG_NAME)
+PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \
+       http://mirrors.rootmode.com/ftp.gnupg.org/libgpg-error/ \
+       http://gulus.usherbrooke.ca/pub/appl/GnuPG/libgpg-error/ \
+       http://gnupg.unixmexico.org/ftp/libgpg-error/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
 
@@ -16,16 +19,14 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
-BR2_PACKAGE_LIBGPG_ERROR=m
-
 $(eval $(call PKG_template,LIBGPG_ERROR,libgpg-error,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
        (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
                $(TARGET_CONFIGURE_OPTS) \
                CFLAGS="$(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) \
@@ -52,7 +53,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
        );
        touch $@
 
-$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
+$(PKG_BUILD_DIR)/.built:
        rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
@@ -60,21 +61,21 @@ $(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/.configured
                all install
        touch $@
 
-$(IPKG_LIBGPG_ERROR): $(STAGING_DIR)/usr/lib/libgpg-error.so
+$(IPKG_LIBGPG_ERROR):
        install -m0755 -d $(IDIR_LIBGPG_ERROR)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(IDIR_LIBGPG_ERROR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.so.* $(IDIR_LIBGPG_ERROR)/usr/lib/
        $(RSTRIP) $(IDIR_LIBGPG_ERROR)
        $(IPKG_BUILD) $(IDIR_LIBGPG_ERROR) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libgpg-error.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(STAGING_DIR)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/gpg-error-config $(STAGING_DIR)/usr/bin/
        mkdir -p $(STAGING_DIR)/usr/include
-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/gpg-error.h $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/gpg-error.h $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpg-error.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/share/aclocal
-       cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 $(STAGING_DIR)/usr/share/aclocal/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/gpg-error.m4 $(STAGING_DIR)/usr/share/aclocal/
        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libgpg-error.so
@@ -86,5 +87,9 @@ uninstall-dev:
                $(STAGING_DIR)/usr/lib/libgpg-error.{a,so*} \
                $(STAGING_DIR)/usr/share/aclocal/gpg-error.m4 \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
+
+mostlyclean:
+       make -C $(PKG_BUILD_DIR) clean
+       rm -f $(PKG_BUILD_DIR)/.built