clean up libgcrypt installation
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 24 Dec 2007 01:24:48 +0000 (01:24 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Mon, 24 Dec 2007 01:24:48 +0000 (01:24 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@9887 3c298f89-4303-0410-b956-a3cf2f4a3e73

libs/libgcrypt/Makefile

index 11580f9..87397d9 100644 (file)
@@ -54,20 +54,19 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-       mkdir -p $(2)/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(2)/bin/
-       mkdir -p $(1)/usr/include
+       mkdir -p $(1)/usr/bin $(2)/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/share/aclocal
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/libgcrypt-config $(1)/usr/bin/
        $(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
+       $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(1)/usr/lib,g' $(1)/usr/bin/libgcrypt-config
+       $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(1)/usr/bin/libgcrypt-config
+       ln -sf $(1)/usr/bin/libgcrypt-config $(2)/bin/
 endef
 
 define Build/UninstallDev
        rm -rf \
+               $(1)/usr/bin/libgcrypt-config \
                $(2)/bin/libgcrypt-config \
                $(1)/usr/include/gcrypt*.h \
                $(1)/usr/lib/libgcrypt.{a,so*} \