diff options
| author | Akim Demaille <akim@lrde.epita.fr> | 2007-11-24 12:24:22 +0100 |
|---|---|---|
| committer | Akim Demaille <akim@lrde.epita.fr> | 2007-11-24 12:26:30 +0100 |
| commit | 94e81d5582c92a4376744bc5e601f60773f63e71 (patch) | |
| tree | 1c99f94c3e39fe58ce1c2125e274b02e71061649 /lib/am/scripts.am | |
| parent | 1d0c65c8894d499ad034c9cc189808d4ecd3db5c (diff) | |
| download | automake-94e81d5582c92a4376744bc5e601f60773f63e71.tar.gz | |
Ternary operator in lib/am files.
* automake.in (&transform_token): New.
(&transform): Use it.
Support %KEY?TRUE:FALSE%.
(&make_paragraphs): Adjust the regexp to call %transform.
* lib/am/data.am, lib/am/libs.am, lib/am/lisp.am, lib/am/ltlib.am,
* lib/am/progs.am, lib/am/python.am, lib/am/scripts.am:
Use %KEY?TRUE:FALSE%.
* lib/am/inst-vars.am (am__strip_dir): Assign the result to f
to be more alike am__vpath_adj.
Adjust dependencies.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Diffstat (limited to 'lib/am/scripts.am')
| -rw-r--r-- | lib/am/scripts.am | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/am/scripts.am b/lib/am/scripts.am index 0e11c8093..a2ab18f5d 100644 --- a/lib/am/scripts.am +++ b/lib/am/scripts.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006 +## Copyright (C) 1994, 1995, 1996, 1998, 1999, 2001, 2003, 2004, 2006, 2007 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -30,18 +30,15 @@ endif %?INSTALL% if %?INSTALL% ## if doesn't work properly for Automake variables yet. am__installdirs += "$(DESTDIR)$(%NDIR%dir)" -?BASE?%DIR%SCRIPT_INSTALL = $(INSTALL_SCRIPT) -?!BASE?%DIR%SCRIPT_INSTALL = $(install_sh_SCRIPT) -?EXEC?.PHONY install-exec-am: install-%DIR%SCRIPTS -?!EXEC?.PHONY install-data-am: install-%DIR%SCRIPTS +%DIR%SCRIPT_INSTALL = %BASE?$(INSTALL_SCRIPT):$(install_sh_SCRIPT)% +.PHONY install-%EXEC?exec:data%-am: install-%DIR%SCRIPTS install-%DIR%SCRIPTS: $(%DIR%_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(%NDIR%dir)" || $(MKDIR_P) "$(DESTDIR)$(%NDIR%dir)" ?!BASE? @$(am__vpath_adj_setup) \ ## Funny invocation because Makefile variable can be empty, leading to ## a syntax error in sh. -?!BASE? list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ -?BASE? @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ + %BASE?@%list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ ?!BASE? $(am__vpath_adj) p=$$f; \ ## A file can be in the source directory or the build directory. if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -70,8 +67,7 @@ if %?INSTALL% uninstall-%DIR%SCRIPTS: @$(NORMAL_UNINSTALL) ?!BASE? @$(am__vpath_adj_setup) \ -?!BASE? list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ -?BASE? @list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ + %BASE?@%list='$(%DIR%_SCRIPTS)'; for p in $$list; do \ ?!BASE? $(am__vpath_adj) p=$$f; \ ## Remove any leading directory before applying $(transform). f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ |