diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-06-09 11:37:01 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2013-06-09 11:37:01 +0200 |
| commit | 9892eb7823b3fd0e552ab22b63f58d947e9de584 (patch) | |
| tree | a89472d4b94f94f1e74c1cba994035cd9350227b /lib | |
| parent | e9d79f111a43882d299ca9ee8d4783f4bc17b99a (diff) | |
| parent | 2d6fec692f032ab60c27f5c22391ae87e49c53c7 (diff) | |
| download | automake-9892eb7823b3fd0e552ab22b63f58d947e9de584.tar.gz automake-9892eb7823b3fd0e552ab22b63f58d947e9de584.tar.bz2 automake-9892eb7823b3fd0e552ab22b63f58d947e9de584.zip | |
Merge branch 'micro' into maint
* micro:
maint: add a missing copyright notice
sync: update config.guess from upstream
tests: expose automake bug#13928
comments: fix some out-of-sync refs to test scripts
tests: expose automake bug#13940
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Automake/Rule.pm | 4 | ||||
| -rw-r--r-- | lib/am/distdir.am | 2 | ||||
| -rwxr-xr-x | lib/config.guess | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm index ac4b71afd..7fe647492 100644 --- a/lib/Automake/Rule.pm +++ b/lib/Automake/Rule.pm @@ -631,7 +631,7 @@ sub _maybe_warn_about_duplicated_target ($$$$$$) ## from rules that only add dependencies. E.g., ## .PHONY: foo ## .PHONY: bar - ## is legitimate. (This is phony.test.) + ## is legitimate. This is checked in the 'phony.sh' test. # msg ('syntax', $where, # "redefinition of '$target'$condmsg ...", partial => 1); @@ -734,7 +734,7 @@ sub _conditionals_for_rule ($$$$) # condition. So for now we do our best *here*. If 'foo:' # was already defined in condition COND1 and we want to define # it in condition TRUE, then define it only in condition !COND1. - # (See cond14.test and cond15.test for some test cases.) + # (See cond14.sh and cond15.sh for some test cases.) @conds = $rule->not_always_defined_in_cond ($cond)->conds; # No conditions left to define the rule. diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 0e5f6bdb9..f3549876e 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -197,7 +197,7 @@ endif %?TOPDIR_P% ## Test for file existence because sometimes a file gets included in ## DISTFILES twice. For example this happens when a single source ## file is used in building more than one program. -## See also test 'dist-repeated.test'. +## See also test 'dist-repeated.sh'. test -f "$(distdir)/$$file" \ || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ diff --git a/lib/config.guess b/lib/config.guess index 120cc0d23..516ac6c17 100755 --- a/lib/config.guess +++ b/lib/config.guess @@ -995,6 +995,12 @@ EOF ppc:Linux:*:*) echo powerpc-unknown-linux-${LIBC} exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; |