Mailing List Archive

Author: stevehay
Date: Tue Apr 14 08:13:34 2015
New Revision: 1673381

URL: http://svn.apache.org/r1673381
Log:
Restore the creation of mod_perl.spec in "(n)make dist" on WIN32 since it is required (for other OSes!) in release tarballs

It's just the "rpm" target itself which needs to be omitted on WIN32 (see r1477980).

Modified:
perl/modperl/trunk/Makefile.PL

Modified: perl/modperl/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Makefile.PL?rev=1673381&r1=1673380&r2=1673381&view=diff
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Tue Apr 14 08:13:34 2015
@@ -873,16 +873,8 @@ sub MY::postamble {

my $string = $self->ModPerl::BuildMM::MY::postamble;

- if (WIN32) {
+ if (!WIN32) {
$string .= <<'EOF';
-mydist : Apache-Test/META.yml manifest tardist
-
-EOF
- }
- else {
- $string .= <<'EOF';
-mydist : Apache-Test/META.yml mod_perl.spec manifest tardist
-
rpm: dist
@[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm
rpmbuild -ta --define "_rpmdir $(PWD)/rpm" \
@@ -891,13 +883,15 @@ rpm: dist
@mv $(PWD)/rpm/*/*.rpm $(PWD)/rpm/
@rm -rf $(PWD)/rpm/*/

-mod_perl.spec: build/make_rpm_spec
- $(PERL) build/make_rpm_spec
-
EOF
}

$string .= <<'EOF';
+mydist : Apache-Test/META.yml mod_perl.spec manifest tardist
+
+mod_perl.spec: build/make_rpm_spec
+ $(PERL) build/make_rpm_spec
+
Apache-Test/META.yml:
cd Apache-Test && make metafile