Distinguish automake substitutions from config.status

substitutions.
* automake.in (&add_depend2): Transform AMDEP.
(&handle_clean): Transform MCFILES and MFILES.
(&file_contents): Transform MAINTAINER_MODE.
(&transform, &am_install_var): Use `%', not `@'.
Adjust all the *.am files.
* clean.am: Use ?MFILES? instead of ad hoc MAINTAINERCLEAN.
* depend2.am: Display the double dependency on both ?AMDEP? and
@AMDEP@.

1 files changed, 13 insertions, 13 deletions

diff --git a/lib/am/data.am b/lib/am/data.am
index 2b11f09b6..0e92596d3 100644
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -16,31 +16,31 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-_am_installdirs += $(DESTDIR)$(@NDIR@dir)
-?EXEC?.PHONY install-exec-am: install-@DIR@DATA
-?!EXEC?.PHONY install-data-am: install-@DIR@DATA
-install-@DIR@DATA: $(@DIR@_DATA)
+_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?EXEC?.PHONY install-exec-am: install-%DIR%DATA
+?!EXEC?.PHONY install-data-am: install-%DIR%DATA
+install-%DIR%DATA: $(%DIR%_DATA)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
+	$(mkinstalldirs) $(DESTDIR)$(%NDIR%dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
-	@list='$(@DIR@_DATA)'; for p in $$list; do \
+	@list='$(%DIR%_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 ## If the _DATA variable has an entry like foo/bar, install it as
 ## $(destdir)/bar, not $(destdir)/foo/bar.  The user can always make a
 ## new dir variable for the latter case.
 ?BASE?	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 ?!BASE?	  f="$$p"; \
-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
+	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \
 	done
 
-.PHONY uninstall-am: uninstall-@DIR@DATA
-uninstall-@DIR@DATA:
+.PHONY uninstall-am: uninstall-%DIR%DATA
+uninstall-%DIR%DATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(@DIR@_DATA)'; for p in $$list; do \
+	@list='$(%DIR%_DATA)'; for p in $$list; do \
 ?BASE?	  f="`echo $$p | sed -e 's|^.*/||'`"; \
 ?!BASE?	  f="$$p"; \
-	  echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
-	  rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
+	  echo " rm -f $(DESTDIR)$(%NDIR%dir)/$$f"; \
+	  rm -f $(DESTDIR)$(%NDIR%dir)/$$f; \
 	done