fix broken openser menuconfig and package template call

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

diff --git a/openwrt/package/gnutls/Makefile b/openwrt/package/gnutls/Makefile
index fdb3b13..5257850 100644 (file)
--- a/openwrt/package/gnutls/Makefile
+++ b/openwrt/package/gnutls/Makefile
@@ -35,7 +35,7 @@ $(PKG_BUILD_DIR)/.configured:
                $(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) \
@@ -62,10 +62,9 @@ $(PKG_BUILD_DIR)/.configured:
                --disable-srp-authentication \
                --disable-anon-authentication \
                --disable-openpgp-authentication \
-               --with-libgcrypt-prefix="$(STAGING_DIR)/usr" \
-               --with-libopencdk-prefix="$(STAGING_DIR)/usr" \
-               --with-libtasn1-prefix="$(STAGING_DIR)/usr" \
-               --with-included-libcfg \
+               --with-included-opencdk=yes \
+               --with-included-libtasn1=yes \
+               --with-included-libcfg=yes \
                --without-zlib \
                --without-lzo \
        );
@@ -81,34 +80,34 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBGNUTLS):
        install -m0755 -d $(IDIR_LIBGNUTLS)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra}.so.* $(IDIR_LIBGNUTLS)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra}.so.* $(IDIR_LIBGNUTLS)/usr/lib/
        $(RSTRIP) $(IDIR_LIBGNUTLS)
        $(IPKG_BUILD) $(IDIR_LIBGNUTLS) $(PACKAGE_DIR)
 
 $(IPKG_LIBGNUTLS_OPENSSL):
        install -m0755 -d $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgnutls-openssl.so.* $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls-openssl.so.* $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib/
        $(RSTRIP) $(IDIR_LIBGNUTLS_OPENSSL)
        $(IPKG_BUILD) $(IDIR_LIBGNUTLS_OPENSSL) $(PACKAGE_DIR)
 
 $(IPKG_GNUTLS_UTILS):
        install -m0755 -d $(IDIR_GNUTLS_UTILS)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/certtool $(IDIR_GNUTLS_UTILS)/usr/bin/
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(IDIR_GNUTLS_UTILS)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(IDIR_GNUTLS_UTILS)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(IDIR_GNUTLS_UTILS)/usr/bin/
        $(RSTRIP) $(IDIR_GNUTLS_UTILS)
        $(IPKG_BUILD) $(IDIR_GNUTLS_UTILS) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/libgnutls.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(STAGING_DIR)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libgnutls{,-extra}-config $(STAGING_DIR)/usr/bin/
        mkdir -p $(STAGING_DIR)/usr/include
-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/gnutls $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/gnutls $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra,-openssl}.{a,so*} $(STAGING_DIR)/usr/lib/
        mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc $(STAGING_DIR)/usr/lib/pkgconfig/
        mkdir -p $(STAGING_DIR)/usr/share/aclocal
-       cp -fpR $(PKG_INSTALL_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4 $(STAGING_DIR)/usr/share/aclocal/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4 $(STAGING_DIR)/usr/share/aclocal/
        touch $@
 
 install-dev: $(STAGING_DIR)/usr/lib/libgnutls.so
@@ -121,9 +120,8 @@ uninstall-dev:
                $(STAGING_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc \
                $(STAGING_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4 \
 
-compile: install-dev
-
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev
 
 mostlyclean:
        make -C $(PKG_BUILD_DIR) clean