PROGS -> SCRIPTS

diff --git a/Makefile.in b/Makefile.in
index aff1f702d431a31b4598892af996d25e6df1ac9c..e7aab1db8d622120e445cb52ab6183e98bc27190 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -26,12 +26,11 @@ INSTALL_DATA = @INSTALL_DATA@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 M4 = @M4@
+PERL = @PERL@
 
 # Programs that are always installed.
-APROGS = autoconf autoheader autoreconf autoupdate ifnames 
-PROGS = $(APROGS) @PROGS@
-# Path of the perl interpreter.
-PERL = @PERL@
+ASCRIPTS = autoconf autoheader autoreconf autoupdate ifnames 
+SCRIPTS = $(ASCRIPTS) @SCRIPTS@
 
 transform=@program_transform_name@
 
@@ -74,7 +73,7 @@ DISTFILES = COPYING ChangeLog ChangeLog.1 INSTALL \
 editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''M4''@,$(M4),g'
 editpl = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''PERL''@,$(PERL),g'
 
-all: ${PROGS}
+all: ${SCRIPTS}
 
 .SUFFIXES:
 .SUFFIXES: .sh .pl
@@ -112,6 +111,7 @@ check: all
        test -r install-sh || cp $(srcdir)/install-sh .; \
        cd testsuite && ${MAKE} $@ AUTOCONF=$$rootme/autoconf \
        AUTOCONFFLAGS="-m $$srcrootme"
+
 installcheck: all install
        cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
 
@@ -126,7 +126,7 @@ install: all $(M4FILES) acconfig.h installdirs install-info
        *traditional*) ;; \
        *) echo Error: Autoconf requires GNU m4 1.1 or later; exit 1 ;; \
        esac
-       for p in $(APROGS); do \
+       for p in $(ASCRIPTS); do \
          $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
        done
        for i in $(M4FILES) acconfig.h; do \
@@ -151,13 +151,15 @@ install-info: info installdirs
        done
 
 uninstall:
-       cd $(bindir) && rm -f $(PROGS)
+       for p in $(SCRIPTS); do \
+         rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
+       done
        rm -fr $(acdatadir)
        cd $(infodir); rm -f autoconf.info*
        if test -f standards.info || test -f $(srcdir)/standards.info; \
        then cd $(infodir); rm -f standards.info*; fi
 
-configure: configure.in $(M4FILES)
+${srcdir}/configure: configure.in $(M4FILES)
        cd $(srcdir); \
        rm -f $@ $@.tmp; \
        $(M4) autoconf.m4 configure.in > $@.tmp && \
@@ -174,7 +176,7 @@ clean mostlyclean distclean realclean::
        done
 
 clean mostlyclean distclean realclean::
-       rm -f $(PROGS) *.tmp 
+       rm -f $(SCRIPTS) *.tmp 
        rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
        rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
        rm -f *.ev *.evs *.ov *.ovs *.cv *.cvs *.ma *.mas

diff --git a/configure.in b/configure.in
index 893cee2f8354952a9887639d0937fe7a6904b800..7fd871e0218642daf20b62e67505ff3ee54153ab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -12,9 +12,9 @@ AC_PATH_PROGS(M4, gm4 gnum4 m4, m4)
 dnl We use a path for perl so the #! line in autoscan will work.
 AC_PATH_PROG(PERL, perl, no)
 AC_SUBST(PERL)dnl
-AC_SUBST(PROGS)dnl
+AC_SUBST(SCRIPTS)dnl
 if test "$PERL" != no; then
-  PROGS=autoscan
+  SCRIPTS=autoscan
 else
   AC_MSG_WARN(autoscan will not be built since perl is not found)
 fi

diff --git a/doc/Makefile.in b/doc/Makefile.in
index aff1f702d431a31b4598892af996d25e6df1ac9c..e7aab1db8d622120e445cb52ab6183e98bc27190 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -26,12 +26,11 @@ INSTALL_DATA = @INSTALL_DATA@
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi
 M4 = @M4@
+PERL = @PERL@
 
 # Programs that are always installed.
-APROGS = autoconf autoheader autoreconf autoupdate ifnames 
-PROGS = $(APROGS) @PROGS@
-# Path of the perl interpreter.
-PERL = @PERL@
+ASCRIPTS = autoconf autoheader autoreconf autoupdate ifnames 
+SCRIPTS = $(ASCRIPTS) @SCRIPTS@
 
 transform=@program_transform_name@
 
@@ -74,7 +73,7 @@ DISTFILES = COPYING ChangeLog ChangeLog.1 INSTALL \
 editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''M4''@,$(M4),g'
 editpl = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''PERL''@,$(PERL),g'
 
-all: ${PROGS}
+all: ${SCRIPTS}
 
 .SUFFIXES:
 .SUFFIXES: .sh .pl
@@ -112,6 +111,7 @@ check: all
        test -r install-sh || cp $(srcdir)/install-sh .; \
        cd testsuite && ${MAKE} $@ AUTOCONF=$$rootme/autoconf \
        AUTOCONFFLAGS="-m $$srcrootme"
+
 installcheck: all install
        cd testsuite && ${MAKE} AUTOCONF=${bindir}/autoconf $@
 
@@ -126,7 +126,7 @@ install: all $(M4FILES) acconfig.h installdirs install-info
        *traditional*) ;; \
        *) echo Error: Autoconf requires GNU m4 1.1 or later; exit 1 ;; \
        esac
-       for p in $(APROGS); do \
+       for p in $(ASCRIPTS); do \
          $(INSTALL_PROGRAM) $$p $(bindir)/`echo $$p|sed '$(transform)'`; \
        done
        for i in $(M4FILES) acconfig.h; do \
@@ -151,13 +151,15 @@ install-info: info installdirs
        done
 
 uninstall:
-       cd $(bindir) && rm -f $(PROGS)
+       for p in $(SCRIPTS); do \
+         rm -f $(bindir)/`echo $$p|sed '$(transform)'`; \
+       done
        rm -fr $(acdatadir)
        cd $(infodir); rm -f autoconf.info*
        if test -f standards.info || test -f $(srcdir)/standards.info; \
        then cd $(infodir); rm -f standards.info*; fi
 
-configure: configure.in $(M4FILES)
+${srcdir}/configure: configure.in $(M4FILES)
        cd $(srcdir); \
        rm -f $@ $@.tmp; \
        $(M4) autoconf.m4 configure.in > $@.tmp && \
@@ -174,7 +176,7 @@ clean mostlyclean distclean realclean::
        done
 
 clean mostlyclean distclean realclean::
-       rm -f $(PROGS) *.tmp 
+       rm -f $(SCRIPTS) *.tmp 
        rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
        rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
        rm -f *.ev *.evs *.ov *.ovs *.cv *.cvs *.ma *.mas