X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=debian%2Frules;h=9249f8889e26bda0159b9217ed7a1f5db728265d;hp=6580f96ebf13618980465ab89873310e76fd8b91;hb=7b98714769cf69198c85113476b65f07455305e8;hpb=c7821c26c30b0a79658b626ee7f2a17f73cdc952

diff --git a/debian/rules b/debian/rules
index 6580f96e..9249f888 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,9 +30,27 @@ override_dh_gencontrol:
 	 v=$$(perl -ne 'print if s/^version:\s+//i' DEBIAN/control); \
 	 perl -i -pe "s/UNRELEASED/$$v/g if m/###substituted###/" usr/bin/dgit
 
+globalperl=/usr/share/perl5
+infraperl=/usr/share/dgit/infra/perl5
+
 override_dh_auto_install:
 	make install prefix=/usr DESTDIR=debian/dgit
-	make install-infra prefix=/usr DESTDIR=debian/dgit-infrastructure
+	make install-infra prefix=/usr DESTDIR=debian/dgit-infrastructure \
+		perldir=$(infraperl)
+#	# Most of the Perl modules in dgit-infrastructure live in
+#	# $(infraperl).  The exception is Debian::Dgit::Infra, which
+#	# lives in $(globalperl) and adds $(infraperl) to @INC.
+	set -ex; \
+	 base=debian/dgit-infrastructure; \
+	 mod=Debian/Dgit/Infra.pm; \
+	 src=$${base}$(infraperl)/$${mod}; \
+	 dst=$${base}$(globalperl)/$${mod}; \
+	 mkdir -p $${dst%/*}; \
+	 mv -f $$src $$dst; \
+	 perl -i -p -e 'next unless m/###substituted###/;' \
+		-e 'next unless s/^# (?=unshift \@INC,)//;' \
+		-e 'die unless s{q\{\S+\}}{q{$(infraperl)}};' \
+		 $$dst
 
 debian/tests/control: tests/enumerate-tests debian/tests/control.in
 	$< gencontrol >$@.new && mv -f $@.new $@