fix gcrypt staging
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 23 Dec 2007 21:35:59 +0000 (21:35 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 23 Dec 2007 21:35:59 +0000 (21:35 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@9881 3c298f89-4303-0410-b956-a3cf2f4a3e73

libs/libgcrypt/Makefile

index 00a69af..11580f9 100644 (file)
@@ -54,22 +54,24 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(1)/usr/bin/
+       mkdir -p $(2)/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(2)/bin/
        mkdir -p $(1)/usr/include
        $(CP) $(PKG_INSTALL_DIR)/usr/include/gcrypt*.h $(1)/usr/include/
        mkdir -p $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgcrypt.{a,so*} $(1)/usr/lib/
        mkdir -p $(1)/usr/share/aclocal
        $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libgcrypt.m4 $(1)/usr/share/aclocal/
+       $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(1)/usr/lib,g' $(2)/bin/libgcrypt-config
+       $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(2)/bin/libgcrypt-config
 endef
 
 define Build/UninstallDev
        rm -rf \
-               $(STAGING_DIR)/usr/bin/libgcrypt-config \
-               $(STAGING_DIR)/usr/include/gcrypt*.h \
-               $(STAGING_DIR)/usr/lib/libgcrypt.{a,so*} \
-               $(STAGING_DIR)/usr/share/aclocal/libgcrypt.m4
+               $(2)/bin/libgcrypt-config \
+               $(1)/usr/include/gcrypt*.h \
+               $(1)/usr/lib/libgcrypt.{a,so*} \
+               $(1)/usr/share/aclocal/libgcrypt.m4
 endef
 
 define Package/libgcrypt/install