[svn] r6386 - trunk/tools/dar

[packagers at lists.rpmforge.net]

Author: dag
Date: 2008-06-23 17:53:15 +0100 (Mon, 23 Jun 2008)
New Revision: 6386

Modified:
   trunk/tools/dar/dar-perl.py
Log:
Revert the change for Build.PL vs. Makefile.PL

Modified: trunk/tools/dar/dar-perl.py
===================================================================
--- trunk/tools/dar/dar-perl.py	2008-06-23 00:54:23 UTC (rev 6385)
+++ trunk/tools/dar/dar-perl.py	2008-06-23 16:53:15 UTC (rev 6386)
@@ -519,7 +519,7 @@
 else:
     print >>out, 'BuildRequires: perl'
 
-if package_build:
+if package_build and not package_make:
     print >>out, 'BuildRequires: perl(Module::Build)'
 
 if meta.has_key('build_requires'):
@@ -560,35 +560,35 @@
 print >>out, "%build"
 if noarch:
 
-    if package_build:
+    if package_make:
+#       print >>out, '%{__perl} Makefile.PL INSTALLDIRS="vendor" destdir="%{buildroot}"'
+        print >>out, '%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"'
+        print >>out, '%{__make} %{?_smp_mflags}'
+    else:
         print >>out, '#%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"'
         print >>out, '#%{__make} %{?_smp_mflags}'
         print >>out, '%{__perl} Build.PL'
         print >>out, './Build'
-#        print >>out, '%{__perl} Makefile.PL INSTALLDIRS="vendor" destdir="%{buildroot}"'
+else:
+    if package_make:
+#       print >>out, 'CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" destdir="%{buildroot}"'
+        print >>out, 'CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"'
+        print >>out, '%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"'
     else:
-        print >>out, '%{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"'
-        print >>out, '%{__make} %{?_smp_mflags}'
-else:
-    if package_build:
         print >>out, '#CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"'
         print >>out, '#%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"'
         print >>out, 'CFLAGS="%{optflags}" %{__perl} Build.PL'
         print >>out, './Build'
-#        print >>out, 'CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" destdir="%{buildroot}"'
-    else:
-        print >>out, 'CFLAGS="%{optflags}" %{__perl} Makefile.PL INSTALLDIRS="vendor" PREFIX="%{buildroot}%{_prefix}"'
-        print >>out, '%{__make} %{?_smp_mflags} OPTIMIZE="%{optflags}"'
 print >>out
 
 print >>out, '%install'
 print >>out, '%{__rm} -rf %{buildroot}'
-if package_build:
+if package_make:
+#   print >>out, '%{__make} install'
+    print >>out, '%{__make} pure_install'
+else:
     print >>out, '#%{__make} pure_install'
     print >>out, 'PERL_INSTALL_ROOT="%{buildroot}" ./Build install installdirs="vendor"'
-#    print >>out, '%{__make} install'
-else:
-    print >>out, '%{__make} pure_install'
 print >>out
 
 print >>out, '### Clean up buildroot'