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/data.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/data.am')
| -rw-r--r-- | lib/am/data.am | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/am/data.am b/lib/am/data.am index eea2ef27e..25c6626a7 100644 --- a/lib/am/data.am +++ b/lib/am/data.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 @@ -29,23 +29,20 @@ if %?INSTALL% am__installdirs += "$(DESTDIR)$(%NDIR%dir)" ?BASE?%DIR%%PRIMARY%_INSTALL = $(INSTALL_%ONE_PRIMARY%) ?!BASE?%DIR%%PRIMARY%_INSTALL = $(install_sh_DATA) -?EXEC?.PHONY install-exec-am: install-%DIR%%PRIMARY% -?!EXEC?.PHONY install-data-am: install-%DIR%%PRIMARY% +.PHONY install-%EXEC?exec:data%-am: install-%DIR%%PRIMARY% install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%) @$(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%_%PRIMARY%)'; for p in $$list; do \ -?BASE? @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ + %BASE?@%list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ ## A file can be in the source directory or the build directory. if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ## If the _%PRIMARY% variable has an entry like foo/bar, install it as ## $(destdir)/bar, not $(destdir)/foo/bar. The user can make a ## new dir variable or use a nobase_ target for the latter case. -?BASE? f=$(am__strip_dir) \ -?!BASE? $(am__vpath_adj) \ + %BASE?$(am__strip_dir):$(am__vpath_adj)% \ echo " $(%DIR%%PRIMARY%_INSTALL) '$$d$$p' '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ $(%DIR%%PRIMARY%_INSTALL) "$$d$$p" "$(DESTDIR)$(%NDIR%dir)/$$f"; \ done @@ -61,10 +58,8 @@ if %?INSTALL% uninstall-%DIR%%PRIMARY%: @$(NORMAL_UNINSTALL) ?!BASE? @$(am__vpath_adj_setup) \ -?!BASE? list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ -?BASE? @list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ -?BASE? f=$(am__strip_dir) \ -?!BASE? $(am__vpath_adj) \ + %BASE?@%list='$(%DIR%_%PRIMARY%)'; for p in $$list; do \ + %BASE?$(am__strip_dir):$(am__vpath_adj)% \ echo " rm -f '$(DESTDIR)$(%NDIR%dir)/$$f'"; \ rm -f "$(DESTDIR)$(%NDIR%dir)/$$f"; \ done |