Jelajahi Sumber

fix mod_perl support

Ralf S. Engelschall 23 tahun lalu
induk
melakukan
8ecec1e741
1 mengubah file dengan 7 tambahan dan 9 penghapusan
  1. 7 9
      apache/apache.spec

+ 7 - 9
apache/apache.spec

@@ -143,7 +143,7 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      ASF
 Version:      %{V_apache}
-Release:      20021023
+Release:      20021120
 
 #   list of sources
 Source0:      http://www.apache.org/dist/httpd/apache_%{V_apache}.tar.gz
@@ -401,15 +401,15 @@ AutoReqProv:  no
     ( cd mod_perl-%{V_mod_perl}
       eval `%{l_prefix}/bin/perl -V:archname`
       eval `%{l_prefix}/bin/perl -V:version`
+      eval `%{l_prefix}/bin/perl -V:installarchlib -V:installprivlib -V:installsitearch -V:installsitelib`
       %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
       perl=$RPM_BUILD_ROOT%{l_prefix}/bin/perl
       echo "#!/bin/sh" >$perl
       echo "exec %{l_prefix}/bin/perl \\" >>$perl
-      echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version} \\" >>$perl
-      echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version}/${archname} \\" >>$perl
-      echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl \\" >>$perl
-      echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version} \\" >>$perl
-      echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version}/${archname} \\" >>$perl
+      echo " -I${RPM_BUILD_ROOT}${installarchlib}  \\" >>$perl
+      echo " -I${RPM_BUILD_ROOT}${installprivlib}  \\" >>$perl
+      echo " -I${RPM_BUILD_ROOT}${installsitearch} \\" >>$perl
+      echo " -I${RPM_BUILD_ROOT}${installsitelib}  \\" >>$perl
       echo " \"\$@\"" >>$perl
       chmod a+x $perl
       $perl Makefile.PL \
@@ -423,9 +423,7 @@ AutoReqProv:  no
           PERL_DIRECTIVE_HANDLERS=1
       %{l_make} %{l_mflags}
       %{l_make} %{l_mflags} install
-      mkdir $RPM_BUILD_ROOT%{l_prefix}/perl5
-      mv $RPM_BUILD_ROOT%{l_prefix}/lib/* $RPM_BUILD_ROOT%{l_prefix}/perl5/
-      mv $RPM_BUILD_ROOT%{l_prefix}/perl5 $RPM_BUILD_ROOT%{l_prefix}/lib/
+      rm -rf $RPM_BUILD_ROOT%{l_prefix}/man/man3
       %{l_shtool} subst -e "s;^\\(PERL = \\).*;\\1 $perl;" \
           ../apache_%{V_apache}/src/modules/perl/mod_perl.config
     )