git: make the Perl module handling more robust

The differences between CLANG64's Perl setup and MINGW64's point out
some fragile logic I introduced in order to separate the `Git` Perl
module's files from the `Git::SVN` ones.

Let's move that logic into the Makefile which has all the relevant
information to make the logic more robust.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

mingw-w64-git/PKGBUILD

@@ -70,7 +70,7 @@ sha256sums=('d21ed5eb108646012a7f59c354b3dd45f6b6138de6e2b582906517365962b18f'
             'db754d6fe6722ad54d43df15ee93b1d9cead406158ed84dcbf35e5b4225469ed'
             'cbed8b133eb9eec9972f146be5c3ff49db29b2fff8ab9c87a6d0c646c08a5128'
             '027155aa6ca5f11ad7bcb89550a470935a9f22a9d5b3ab80a9eb209983258c1f'
-            '387cbdb711453a7c41830558c351e448952bb7978158c258df093b1742543dfe'
+            '386e965e184f657a5373b117c59e9e8711713e09177623a77718358cbc46296e'
             '7413506c59d25621e475aa45447993748332c72cfbb4cf94cce6bee6f1218a09'
             '6d83e1cb1acdb6eb1f2d5cb9299298e57680f5ca43d43c3e67c9da17f21b9b01')
 
@@ -184,8 +184,9 @@ package_git () {
 
   # Remove git-svn (packaged separately)
   rm -f "$pkgdir/$MINGW_PREFIX/libexec/git-core/git-svn"
+
   # Remove Git.pm and other Perl modules (packaged separately in git-perl & git-svn)
-  rm -rf "$pkgdir/$MINGW_PREFIX"/share/perl5
+  make -j1 -f ../mingw-w64-git.mak DESTDIR="$pkgdir" uninstall-perl-modules
 
   # Remove git-archimport (packaged separately)
   rm -f "$pkgdir/$MINGW_PREFIX/libexec/git-core/git-archimport"
@@ -332,8 +333,6 @@ package_git-perl () {
 
   # Install Git.pm and related Perl modules (excluding Git::SVN)
   make -j1 -f ../mingw-w64-git.mak DESTDIR="$pkgdir" install-perl-module
-  find "$pkgdir/$MINGW_PREFIX/share/perl5" -type f -path "*/Git/SVN*" -delete
-  find "$pkgdir/$MINGW_PREFIX/share/perl5" -type d -empty -delete
 }
 
 package_git-send-email () {
@@ -390,9 +389,7 @@ package_git-svn () {
   install -m755 git-svn "$pkgdir/$MINGW_PREFIX/libexec/git-core/"
 
   # Install Git::SVN Perl modules only
-  make -j1 DESTDIR="$pkgdir" -f ../mingw-w64-git.mak install-perl-module
-  find "$pkgdir/$MINGW_PREFIX/share/perl5" -type f ! -path "*/Git/SVN*" -delete
-  find "$pkgdir/$MINGW_PREFIX/share/perl5" -type d -empty -delete
+  make -j1 DESTDIR="$pkgdir" -f ../mingw-w64-git.mak install-perl-svn-module
 
   # Install documentation
   install -d -m755 "$pkgdir/$MINGW_PREFIX/share/man/man1"

mingw-w64-git/mingw-w64-git.mak

@@ -48,6 +48,21 @@ install-perl-module:
 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perllibdir_SQ)'
 	(cd perl/build/lib && $(TAR) cf - .) | \
 	(cd '$(DESTDIR_SQ)$(perllibdir_SQ)' && umask 022 && $(TAR) xof -)
+	find '$(DESTDIR_SQ)$(perllibdir_SQ)' -type f -path "*/Git/SVN*" -delete
+	find '$(DESTDIR_SQ)$(perllibdir_SQ)' -type d -empty -delete
+
+install-perl-svn-module:
+	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perllibdir_SQ)'
+	(cd perl/build/lib && $(TAR) cf - .) | \
+	(cd '$(DESTDIR_SQ)$(perllibdir_SQ)' && umask 022 && $(TAR) xof -)
+	find '$(DESTDIR_SQ)$(perllibdir_SQ)' -type f ! -path "*/Git/SVN*" -delete
+	find '$(DESTDIR_SQ)$(perllibdir_SQ)' -type d -empty -delete
+
+uninstall-perl-modules:
+	rm $(patsubst perl/%.pm,'$(DESTDIR_SQ)$(perllibdir_SQ)/%.pm',$(LIB_CPAN))
+	rm '$(DESTDIR_SQ)$(perllibdir_SQ)/Git.pm'
+	rm -r '$(DESTDIR_SQ)$(perllibdir_SQ)/Git'
+	find '$(DESTDIR_SQ)$(perllibdir_SQ)' -type d -empty -delete
 endif
 
 install-pdbs: