Distinguish automake substitutions from config.status

[platform/upstream/automake.git] / lib / am / progs.am

diff --git a/lib/am/progs.am b/lib/am/progs.am
index 2c1cc28..c4d03d6 100644 (file)
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -16,30 +16,30 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-_am_installdirs += $(DESTDIR)$(@NDIR@dir)
-?EXEC?.PHONY install-exec-am: install-@DIR@PROGRAMS
-?!EXEC?.PHONY install-data-am: install-@DIR@PROGRAMS
-install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
+_am_installdirs += $(DESTDIR)$(%NDIR%dir)
+?EXEC?.PHONY install-exec-am: install-%DIR%PROGRAMS
+?!EXEC?.PHONY install-data-am: install-%DIR%PROGRAMS
+install-%DIR%PROGRAMS: $(%DIR%_PROGRAMS)
        @$(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@_PROGRAMS)'; for p in $$list; do \
+       @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
          if test -f $$p; then \
 ## Note that we explicitly set the libtool mode.  This avoids any
 ## lossage if the install program doesn't have a name that libtool
 ## expects.
            f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-           echo " $(INSTALL_PROGRAM_ENV) @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
-           $(INSTALL_PROGRAM_ENV) @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(@NDIR@dir)/$$f; \
+           echo " $(INSTALL_PROGRAM_ENV) %LIBTOOL --mode=install% $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f"; \
+           $(INSTALL_PROGRAM_ENV) %LIBTOOL --mode=install% $(INSTALL_PROGRAM) $$p $(DESTDIR)$(%NDIR%dir)/$$f; \
          else :; fi; \
        done
 
-.PHONY uninstall-am: uninstall-@DIR@PROGRAMS
-uninstall-@DIR@PROGRAMS:
+.PHONY uninstall-am: uninstall-%DIR%PROGRAMS
+uninstall-%DIR%PROGRAMS:
        @$(NORMAL_UNINSTALL)
-       @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \
+       @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
          f="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-         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