[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-186-g91d9d81

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=91d9d817eae55f025aa5143f70e382a2f0f17670

The branch, master has been updated
       via  91d9d817eae55f025aa5143f70e382a2f0f17670 (commit)
      from  c1ec86b2a046afb9c31defacef35268378d8d429 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91d9d817eae55f025aa5143f70e382a2f0f17670
Author: Ralf Wildenhues <address@hidden>
Date:   Sat Sep 20 15:38:26 2008 +0200

    Compactify program rules using ternary operators.
    
    * lib/am/progs.am (install-%DIR%PROGRAMS): Uglify^WCompactify
    using ternary operators `%KEY?TRUE:FALSE%'.
    (uninstall-%DIR%PROGRAMS): Likewise.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    5 +++++
 lib/am/progs.am |   15 +++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 80f935a..e9053e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-09-20  Ralf Wildenhues  <address@hidden>
 
+       Compactify program rules using ternary operators.
+       * lib/am/progs.am (install-%DIR%PROGRAMS): Uglify^WCompactify
+       using ternary operators `%KEY?TRUE:FALSE%'.
+       (uninstall-%DIR%PROGRAMS): Likewise.
+
        New doc section about command line length limits.
        * doc/automake.texi (Length limitations): New node.
        (Alternative): `nobase_' is not always equivalent to several
diff --git a/lib/am/progs.am b/lib/am/progs.am
index ea14053..4ed702b 100644
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -33,17 +33,13 @@ install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
 ## On Cygwin with libtool test won't see `foo.exe' but instead `foo'.
 ## So we check for both.
        sed 's/$(EXEEXT)$$//' | \
-       while read p p1; do \
-         if test -f $$p \
-?LIBTOOL?           || test -f $$p1 \
-         ; then echo "$$p"; echo "$$p"; else :; fi; \
+       while read p p1; do if test -f $$p%LIBTOOL? || test -f $$p1%; \
+         then echo "$$p"; echo "$$p"; else :; fi; \
        done | \
 ## We now have a list of sourcefile pairs, separated by newline.
 ## Turn that into "sourcefile source_base target_dir xformed_target_base",
 ## with newlines being turned into spaces in a second step.
-       sed -e 'p;s,.*/,,;n;h' \
-?BASE?     -e 's|.*|.|' \
-?!BASE?            -e 's|[^/]*$$||; s|^$$|.|' \
+       sed -e 'p;s,.*/,,;n;h' -e '%BASE?s|.*|.|:s|[^/]*$$||; s|^$$|.|%' \
            -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
        sed 'N;N;N;s,\n, ,g' | \
 ## The following awk script turns that into one line containing directories
@@ -88,9 +84,8 @@ uninstall-%DIR%PROGRAMS:
 ## Remove any leading directory before applying $(transform),
 ## but keep the directory part in the hold buffer, in order to
 ## reapply it again afterwards in the nobase case.  Append $(EXEEXT).
-         sed 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/; \
-?!BASE?               x;s,[^/]*$$,,;G;s,\n,,; \
-              '`; \
+         sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+             -e 's/$$/$(EXEEXT)/'%BASE? : -e 'x;s,[^/]*$$,,;G;s,\n,,'%`; \
        test -n "$$list" || exit 0; \
        echo " ( cd '$(DESTDIR)$(%NDIR%dir)' && rm -f" $$files ")"; \
        cd "$(DESTDIR)$(%NDIR%dir)" && rm -f $$files


hooks/post-receive
--
GNU Automake