Reign in (a little bit) the sprawling CRLF insanity on Win32

[dbsrgits/DBIx-Class.git] / maint / Makefile.PL.inc / 61_inject_dbicadmin_pod.pl

diff --git a/maint/Makefile.PL.inc/61_inject_dbicadmin_pod.pl b/maint/Makefile.PL.inc/61_inject_dbicadmin_pod.pl
index 46cd783..218527f 100644 (file)
--- a/maint/Makefile.PL.inc/61_inject_dbicadmin_pod.pl
+++ b/maint/Makefile.PL.inc/61_inject_dbicadmin_pod.pl
@@ -5,13 +5,6 @@
 # make sure we delete and re-create the file - just an append
 # will not do what one expects, because on unixy systems the
 # target is symlinked to the original
-
-# FIXME also on win32 EU::Command::cat() adds crlf even if the
-# source files do not contain any :(
-my $crlf_fixup = ($^O eq 'MSWin32' or $^O eq 'cygwin')
-  ? "\t@{[ $mm_proto->oneliner( qq(\$\$ENV{PERLIO}='unix' and system( \$\$^X, qw( -MExtUtils::Command -e dos2unix -- ), q(\$(DISTVNAME)/script/dbicadmin) ) ) ) ]}"
-  : ''
-;
 postamble <<"EOP";
 
 create_distdir : dbic_distdir_dbicadmin_pod_inject
@@ -19,7 +12,10 @@ create_distdir : dbic_distdir_dbicadmin_pod_inject
 dbic_distdir_dbicadmin_pod_inject :
 \t\$(RM_F) \$(DISTVNAME)/script/dbicadmin
 \t@{[ $mm_proto->oneliner('cat', ['-MExtUtils::Command']) ]} script/dbicadmin maint/.Generated_Pod/dbicadmin.pod > \$(DISTVNAME)/script/dbicadmin
-$crlf_fixup
+
+# FIXME also on win32 EU::Command::cat() adds crlf even if the
+# source files do not contain any :(
+@{[ $crlf_fixup->('$(DISTVNAME)/script/dbicadmin') ]}
 EOP
 
 # keep the Makefile.PL eval happy