git: simplify install code
authorPeter Wagner <tripolar@gmx.at>
Sat, 22 Sep 2018 01:15:11 +0000 (03:15 +0200)
committerPeter Wagner <tripolar@gmx.at>
Sat, 22 Sep 2018 01:15:11 +0000 (03:15 +0200)
Signed-off-by: Peter Wagner <tripolar@gmx.at>
net/git/Makefile

index 0b43d11801bf5ba7b9a4f1ab2b9db43839407efa..52779943c6d8b9ff12089d24469d495fe5183eb4 100644 (file)
@@ -106,14 +106,11 @@ define Build/Compile
 endef
 
 define Package/git/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/git $(1)/usr/bin
        $(RM) $(PKG_INSTALL_DIR)/usr/bin/git-cvsserver
+       $(RM) $(PKG_INSTALL_DIR)/usr/bin/git-shell
+       $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/git-* $(1)/usr/bin
        $(INSTALL_DIR) $(1)/usr/lib/git-core
-       ln $(1)/usr/bin/git $(1)/usr/lib/git-core/git
-       ln $(1)/usr/bin/git $(1)/usr/lib/git-core/git-upload-pack
-       ln $(1)/usr/bin/git-shell $(1)/usr/lib/git-core/git-shell
        $(INSTALL_DIR) $(1)/usr/share/git-core/templates
        ( cd $(PKG_INSTALL_DIR); $(TAR) \
                --exclude=usr/lib/git-core/git-http-backend \
@@ -122,13 +119,12 @@ define Package/git/install
                --exclude=usr/lib/git-core/git-remote-ftps \
                --exclude=usr/lib/git-core/git-remote-http \
                --exclude=usr/lib/git-core/git-remote-https \
-               --exclude=usr/lib/git-core/git \
-               --exclude=usr/lib/git-core/git-shell \
-               --exclude=usr/lib/git-core/git-upload-pack \
                -cf - \
                usr/lib/git-core \
                usr/share/git-core/templates \
        ) | ( cd $(1); $(TAR) -xf - )
+       ln $(1)/usr/lib/git-core/git $(1)/usr/bin/git
+       ln $(1)/usr/lib/git-core/git-shell $(1)/usr/bin/git-shell
 endef
 
 define Package/git-http/install