Fix architecture detection by RPM vars: "_arch" -> "_target_cpu"

[macros.git] / AutoGen.pm

diff --git a/AutoGen.pm b/AutoGen.pm
index 5c3c10f..3294492 100644 (file)
--- a/AutoGen.pm
+++ b/AutoGen.pm
@@ -19,6 +19,7 @@
 
 
 package AutoGen;
+require 5.6.0; # at least 'use warnings;' but we need some 5.6.0+ modules anyway
 use vars qw($VERSION);
 $VERSION=do { my @r=(q$Revision$=~/\d+/g); sprintf "%d.".("%03d"x$#r),@r; };
 use strict;
@@ -172,7 +173,7 @@ my($class,%args)=@_;
                        ));
        _system "make dist-tarZ" if $Options{"dist-tarZ"};
        _move _rpmeval("_srcrpmdir")."/$name-*.src.rpm",".";
-       _move _rpmeval("_rpmdir")."/"._rpmeval("_arch")."/$name-*."._rpmeval("_arch").".rpm",".";
+       _move _rpmeval("_rpmdir")."/"._rpmeval("_target_cpu")."/$name-*."._rpmeval("_target_cpu").".rpm",".";
   _system "ls -l $name-*";
        exit 0; # should never return
 }
@@ -439,6 +440,9 @@ my($class,%options)=@_;
 
        return if $Options{"ARGV_dist"};
 
+       # 'configure' defaults to CFLAGS '-g -O2' but our --enable-maintainer-mode
+       # should force '-ggdb3'
+       $ENV{"CFLAGS"}||="";
        # shared/static switching cannot be based on maintainer-mode in configure
        _system(qw(./configure --enable-maintainer-mode),
                        ($Options{"want-libtoolize"} && qw(--enable-shared --disable-static)),