Fix libtool pkg-config paths #1716

[openwrt/svn-archive/archive.git] / libs / gnutls / Makefile

diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 3926545096a46da86890fac448747bff425ccb3d..a7f595df59021c29e031c0b3245ec30447dd4525 100644 (file)
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -68,6 +68,14 @@ define Package/libgnutls-openssl
 endef
 
 define Build/Configure
+       (cd $(PKG_BUILD_DIR); touch \
+               configure.in \
+               acinclude.m4 \
+               aclocal.m4 \
+               Makefile.in \
+               config.h.in \
+               configure \
+       )
        $(call Build/Configure/Default, \
                --enable-shared \
                --enable-static \
@@ -101,6 +109,8 @@ define Build/InstallDev
        $(SED) 's,-L$$$${libdir},,g' $(STAGING_DIR)/usr/lib/pkgconfig/gnutls{,-extra}.pc
        mkdir -p $(STAGING_DIR)/usr/share/aclocal
        $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgnutls{,-extra}.m4 $(STAGING_DIR)/usr/share/aclocal/
+       $(SED)  "s,"prefix\=/usr",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/gnutls-extra.pc
+       $(SED)  "s,"exec_prefix\=/usr",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/gnutls-extra.pc
 endef
 
 define Build/UninstallDev
@@ -112,18 +122,18 @@ define Build/UninstallDev
 endef
 
 define Package/gnutls-utils/install
-       install -d -m0755 $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/certtool $(1)/usr/bin/
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/gnutls-{cli,serv} $(1)/usr/bin/
 endef
 
 define Package/libgnutls/install
-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls{,-extra}.so.* $(1)/usr/lib/
 endef
 
 define Package/libgnutls-openssl/install
-       install -d -m0755 $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnutls-openssl.so.* $(1)/usr/lib/
 endef