diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-08-08 19:45:06 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-08-08 22:23:43 +0200 |
| commit | 15bf58f3d0d9e24f1b38f2802280fb193782ccfb (patch) | |
| tree | 80c290a90407d5d7e0c1562b9357872fa643da4e /lib/am/data.am | |
| parent | 42d205e4a1d77ac6c99684fa6261b256b567324e (diff) | |
| download | automake-15bf58f3d0d9e24f1b38f2802280fb193782ccfb.tar.gz | |
[ng] uninstall: reimplement various recipes using more GNU make features
This change likely introduces subtle semantic changes in corner cases
and tricky situation. Given the simplifications and improved uniformity
it offers, we consider that completely acceptable.
With this change, the test 't/instmany-python.sh' passes once again.
* lib/am/header-vars.mk (am.uninst.cmd): New private make function.
(am.uninst.cmd.aux): Likewise, used internally by the above (and
to be considered an implementation detail of it).
(am__uninstall_files_from_dir): Delete, no more needed.
* lib/am/data.am: Rewrite the uninstall recipe(s) to take advantage
of $(am.uninst.cmd).
* lib/am/libs.am: Likewise.
* lib/am/lisp.am: Likewise.
* lib/am/mans.am: Likewise.
* lib/am/python.am: Likewise.
* lib/am/progs.am: Likewise.
* lib/am/scripts.am: Likewise.
* lib/am/texinfos.am: Likewise (and also of other unrelated GNU make
features while we are at it).
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 'lib/am/data.am')
| -rw-r--r-- | lib/am/data.am | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/am/data.am b/lib/am/data.am index 9b28d20f1..dd604d402 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -73,10 +73,10 @@ if %?INSTALL% .PHONY uninstall-am: uninstall-%DIR%%PRIMARY% uninstall-%DIR%%PRIMARY%: @$(NORMAL_UNINSTALL) - @$(if $(and $(%DIR%_%PRIMARY%),$(%NDIR%dir)), \ -?BASE? files='$(notdir $(%DIR%_%PRIMARY%))'; \ -?!BASE? files='$(patsubst $(srcdir)/%,%,$(%DIR%_%PRIMARY%))'; \ - dir='$(DESTDIR)$(%NDIR%dir)'; $(am__uninstall_files_from_dir)) + $(call am.uninst.cmd,$(%NDIR%dir), \ +?BASE? $(notdir $(%DIR%_%PRIMARY%)) \ +?!BASE? $(patsubst $(srcdir)/%,%,$(%DIR%_%PRIMARY%)) \ + ) endif %?INSTALL% |