* scripts.am (install-@DIR@SCRIPTS): Use NDIR when appropriate.

	(uninstall-@DIR@SCRIPTS): Likewise.
	* progs.am (install-@DIR@PROGRAMS): Use NDIR when appropriate.
	(uninstall-@DIR@PROGRAMS): Likewise.
	* ltlib.am (install-@DIR@LTLIBRARIES): Use NDIR when appropriate.
	(uninstall-@DIR@LTLIBRARIES): Likewise.
	* lisp.am (install-@DIR@LISP): Use NDIR when appropriate.
	(uninstall-@DIR@LISP): Likewise.
	* libs.am (install-@DIR@LIBRARIES): Use NDIR when appropriate.
	(uninstall-@DIR@LIBRARIES): Likewise.
	* java.am (install-@DIR@JAVA): Use NDIR when appropriate.
	(uninstall-@DIR@JAVA): Likewise.
	* header.am (install-@DIR@HEADERS): Use NDIR when appropriate.
	(uninstall-@DIR@HEADERS): Likewise.
	* data.am (install-@DIR@DATA): Use NDIR when appropriate.
	(uninstall-@DIR@DATA): Likewise.
	* Makefile.in: Rebuilt.
	* Makefile.am (dist_pkgdata_DATA): Renamed.
	(EXTRA_DIST): Removed.
	(install-data-hook): Added POST_INSTALL; print commands as they
	are run; respect DESTDIR.
	* dist-vars.am (DISTFILES): Removed $(HEADERS).
	* automake.in (am_install_var): Accept `-candist' and
	`-defaultdist' options.  Handle `dist_' and `nodist_' prefixes.
	(am_primary_prefixes): Added can_dist argument.  Recognize `dist_'
	and `nodist_' prefixes.
	(handle_scripts): Pass -candist to am_install_var.
	(handle_data): Pass -defaultdist to am_install_var.
	(handle_headers): Likewise.
	(handle_emacs_lisp): Pass -candist to am_install_var.
	(handle_java): Pass -candist to am_install_var.

diff --git a/ChangeLog b/ChangeLog
index 7bd87fe93543985b3731256c3a1b2fec0475efa4..81e73f566e7e5c238cc62b2b5e15edab1bca6440 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,37 @@
+1999-03-27  Tom Tromey  <tromey@cygnus.com>
+
+       * scripts.am (install-@DIR@SCRIPTS): Use NDIR when appropriate.
+       (uninstall-@DIR@SCRIPTS): Likewise.
+       * progs.am (install-@DIR@PROGRAMS): Use NDIR when appropriate.
+       (uninstall-@DIR@PROGRAMS): Likewise.
+       * ltlib.am (install-@DIR@LTLIBRARIES): Use NDIR when appropriate.
+       (uninstall-@DIR@LTLIBRARIES): Likewise.
+       * lisp.am (install-@DIR@LISP): Use NDIR when appropriate.
+       (uninstall-@DIR@LISP): Likewise.
+       * libs.am (install-@DIR@LIBRARIES): Use NDIR when appropriate.
+       (uninstall-@DIR@LIBRARIES): Likewise.
+       * java.am (install-@DIR@JAVA): Use NDIR when appropriate.
+       (uninstall-@DIR@JAVA): Likewise.
+       * header.am (install-@DIR@HEADERS): Use NDIR when appropriate.
+       (uninstall-@DIR@HEADERS): Likewise.
+       * data.am (install-@DIR@DATA): Use NDIR when appropriate.
+       (uninstall-@DIR@DATA): Likewise.
+       * Makefile.in: Rebuilt.
+       * Makefile.am (dist_pkgdata_DATA): Renamed.
+       (EXTRA_DIST): Removed.
+       (install-data-hook): Added POST_INSTALL; print commands as they
+       are run; respect DESTDIR.
+       * dist-vars.am (DISTFILES): Removed $(HEADERS).
+       * automake.in (am_install_var): Accept `-candist' and
+       `-defaultdist' options.  Handle `dist_' and `nodist_' prefixes.
+       (am_primary_prefixes): Added can_dist argument.  Recognize `dist_'
+       and `nodist_' prefixes.
+       (handle_scripts): Pass -candist to am_install_var.
+       (handle_data): Pass -defaultdist to am_install_var.
+       (handle_headers): Likewise.
+       (handle_emacs_lisp): Pass -candist to am_install_var.
+       (handle_java): Pass -candist to am_install_var.
+
 1999-03-26  Tom Tromey  <tromey@cygnus.com>
 
        * m4/init.m4: Fixed typo when invoking SHELL.

diff --git a/Makefile.am b/Makefile.am
index 596a6efae3158ae3797d3d0b0d2821799ca6ac95..beed270c2275808113a2c391b14bcfa7a7057d75 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,22 +18,23 @@ ltlib-clean.am ltlib.am ltlibrary.am mans-vars.am mans.am multilib.am \
 program.am progs-clean.am progs.am remake-hdr.am remake.am scripts.am \
 subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am
 
-pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles)
+dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
+$(amfiles)
 
 ## These must all be executable when installed.  However, if we use
 ## _SCRIPTS, then the program transform will be applied, which is not
 ## what we want.  So we make them executable by hand.
 scriptdir = $(pkgdatadir)
-script_DATA = config.guess config.sub install-sh mdate-sh missing \
+dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
 mkinstalldirs elisp-comp ylwrap acinstall
 
 install-data-hook:
-       @for prog in $(script_DATA); do \
-         chmod +x $(scriptdir)/$$prog; \
+       @$(POST_INSTALL)
+       @for prog in $(dist_script_DATA); do \
+         echo " chmod +x $(DESTDIR)$(scriptdir)/$$prog"; \
+         chmod +x $(DESTDIR)$(scriptdir)/$$prog; \
        done
 
-EXTRA_DIST = acinstall $(pkgdata_DATA) $(script_DATA)
-
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in aclocal.in --lang=none \
  --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi
@@ -42,7 +43,7 @@ TAGS_DEPENDENCIES = automake.in aclocal.in automake.texi
 ## `test -x' is not portable.  So we use Perl instead.  If Perl
 ## doesn't exist, then this test is meaningless anyway.
 installcheck-local:
-       for file in $(script_DATA); do \
+       for file in $(dist_script_DATA); do \
          $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \
        done
 

diff --git a/Makefile.in b/Makefile.in
index 729bf4fae198b75a97a7f9f55f949206e92f3e69..9e79f1a62c942f0c23bfc941936ad53be4fa2c15 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -76,13 +76,12 @@ info_TEXINFOS = automake.texi
 amfiles = clean-hdr.am clean-kr.am clean.am comp-vars.am compile.am data-clean.am data.am dejagnu.am depend.am depend2.am dist-vars.am footer.am header-vars.am header.am java-clean.am java.am kr-extra.am library.am libs-clean.am libs.am libtool.am lisp-clean.am lisp.am ltlib-clean.am ltlib.am ltlibrary.am mans-vars.am mans.am multilib.am program.am progs-clean.am progs.am remake-hdr.am remake.am scripts.am subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am
 
 
-pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles)
+dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles)
 
-scriptdir = $(pkgdatadir)
-script_DATA = config.guess config.sub install-sh mdate-sh missing mkinstalldirs elisp-comp ylwrap acinstall
 
+scriptdir = $(pkgdatadir)
+dist_script_DATA = config.guess config.sub install-sh mdate-sh missing mkinstalldirs elisp-comp ylwrap acinstall
 
-EXTRA_DIST = acinstall $(pkgdata_DATA) $(script_DATA)
 
 ETAGS_ARGS = $(amfiles)
 TAGS_DEPENDENCIES = $(ETAGS_ARGS)
@@ -95,16 +94,17 @@ TEXI2DVI = texi2dvi
 INFO_DEPS = automake.info
 DVIS = automake.dvi
 TEXINFOS = automake.texi
-DATA =  $(pkgdata_DATA) $(script_DATA)
+DATA =  $(dist_pkgdata_DATA) $(dist_script_DATA)
 
-DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
-Makefile.in NEWS README-alpha THANKS TODO aclocal.in aclocal.m4 \
-ansi2knr.1 ansi2knr.c automake.in config.guess config.sub configure \
-configure.in elisp-comp install-sh mdate-sh missing mkinstalldirs \
-stamp-vti texinfo.tex version.texi ylwrap
+DIST_COMMON =  README $(dist_pkgdata_DATA) $(dist_script_DATA) AUTHORS \
+COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS README-alpha \
+THANKS TODO aclocal.in aclocal.m4 ansi2knr.1 ansi2knr.c automake.in \
+config.guess config.sub configure configure.in elisp-comp install-sh \
+mdate-sh missing mkinstalldirs stamp-vti texinfo.tex version.texi \
+ylwrap
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP_ENV = --best
 all: all-redirect
@@ -293,37 +293,37 @@ maintainer-clean-aminfo:
          fi; \
        done
 
-install-pkgdataDATA: $(pkgdata_DATA)
+install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-       @list='$(pkgdata_DATA)'; for p in $$list; do \
+       @list='$(dist_pkgdata_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
          echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f"; \
          $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgdatadir)/$$f; \
        done
 
-uninstall-pkgdataDATA:
+uninstall-dist_pkgdataDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(pkgdata_DATA)'; for p in $$list; do \
+       @list='$(dist_pkgdata_DATA)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
          echo " rm -f $(DESTDIR)$(pkgdatadir)/$$f"; \
          rm -f $(DESTDIR)$(pkgdatadir)/$$f; \
        done
 
-install-scriptDATA: $(script_DATA)
+install-dist_scriptDATA: $(dist_script_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(scriptdir)
-       @list='$(script_DATA)'; for p in $$list; do \
+       @list='$(dist_script_DATA)'; for p in $$list; do \
          if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
          echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(scriptdir)/$$f"; \
          $(INSTALL_DATA) $$d$$p $(DESTDIR)$(scriptdir)/$$f; \
        done
 
-uninstall-scriptDATA:
+uninstall-dist_scriptDATA:
        @$(NORMAL_UNINSTALL)
-       @list='$(script_DATA)'; for p in $$list; do \
+       @list='$(dist_script_DATA)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
          echo " rm -f $(DESTDIR)$(scriptdir)/$$f"; \
          rm -f $(DESTDIR)$(scriptdir)/$$f; \
@@ -497,7 +497,8 @@ installcheck: installcheck-recursive
 install-exec-am: install-binSCRIPTS
 install-exec: install-exec-recursive
 
-install-data-am: install-info-am install-pkgdataDATA install-scriptDATA
+install-data-am: install-info-am install-dist_pkgdataDATA \
+               install-dist_scriptDATA
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-data: install-data-recursive
@@ -505,8 +506,8 @@ install-data: install-data-recursive
 install-am: all-am
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-recursive
-uninstall-am: uninstall-binSCRIPTS uninstall-info uninstall-pkgdataDATA \
-               uninstall-scriptDATA
+uninstall-am: uninstall-binSCRIPTS uninstall-info \
+               uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA
 uninstall: uninstall-recursive
 all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA)
 all-redirect: all-recursive
@@ -515,7 +516,8 @@ install-strip:
 installdirs: installdirs-recursive
 installdirs-am:
        $(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) \
-               $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(scriptdir)
+               $(DESTDIR)$(dist_pkgdatadir) \
+               $(DESTDIR)$(dist_scriptdir)
 
 
 mostlyclean-generic:
@@ -555,12 +557,13 @@ maintainer-clean: maintainer-clean-recursive
 .PHONY: uninstall-binSCRIPTS install-binSCRIPTS mostlyclean-vti \
 distclean-vti clean-vti maintainer-clean-vti install-info-am \
 uninstall-info mostlyclean-aminfo distclean-aminfo clean-aminfo \
-maintainer-clean-aminfo uninstall-pkgdataDATA install-pkgdataDATA \
-uninstall-scriptDATA install-scriptDATA install-data-recursive \
-uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+maintainer-clean-aminfo uninstall-dist_pkgdataDATA \
+install-dist_pkgdataDATA uninstall-dist_scriptDATA \
+install-dist_scriptDATA install-data-recursive uninstall-data-recursive \
+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
+uninstalldirs-recursive all-recursive check-recursive \
+installcheck-recursive info-recursive dvi-recursive \
+mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 dvi-am dvi check check-am installcheck-local installcheck-am \
@@ -572,12 +575,14 @@ mostlyclean distclean maintainer-clean
 
 
 install-data-hook:
-       @for prog in $(script_DATA); do \
-         chmod +x $(scriptdir)/$$prog; \
+       @$(POST_INSTALL)
+       @for prog in $(dist_script_DATA); do \
+         echo " chmod +x $(DESTDIR)$(scriptdir)/$$prog"; \
+         chmod +x $(DESTDIR)$(scriptdir)/$$prog; \
        done
 
 installcheck-local:
-       for file in $(script_DATA); do \
+       for file in $(dist_script_DATA); do \
          $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \
        done
 

diff --git a/NEWS b/NEWS
index 1ef97708a53d8b68e1ceb3197e74e3d24f2945fe..7a9be0273be758ad584729b9ea2fa4758cc74592 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ New in 1.4a:
   For instance, a _DATA file can appear in a subdir
 * GNU tar is no longer required for `make dist'
 * The usual bug fixes
+* Added support for `dist_' and `nodist_' prefixes to some primaries
 \f
 New in 1.4:
 * Added support for the Fortran 77 programming language.

diff --git a/automake.in b/automake.in
index 5ad7dbeaec731a01fd9744eb0c1403c27def611d..0fb8edfa941bbc42080b9a26c46631cd14720b4e 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1538,7 +1538,7 @@ sub handle_libraries
                                        'lib', 'pkglib', 'noinst', 'check');
     return if ! @liblist;
 
-    local (%valid) = &am_primary_prefixes ('LIBRARIES', 'lib', 'pkglib',
+    local (%valid) = &am_primary_prefixes ('LIBRARIES', 0, 'lib', 'pkglib',
                                           'noinst', 'check');
     if (! defined $configure_vars{'RANLIB'})
     {
@@ -1635,7 +1635,7 @@ sub handle_ltlibraries
     return if ! @liblist;
 
     local (%instdirs);
-    local (%valid) = &am_primary_prefixes ('LTLIBRARIES', 'lib', 'pkglib',
+    local (%valid) = &am_primary_prefixes ('LTLIBRARIES', 0, 'lib', 'pkglib',
                                           'noinst');
 
     local ($key);
@@ -1803,7 +1803,7 @@ sub handle_scripts
     # NOTE we no longer automatically clean SCRIPTS, because it is
     # useful to sometimes distribute scripts verbatim.  This happens
     # eg in Automake itself.
-    &am_install_var ('scripts', 'SCRIPTS',
+    &am_install_var ('-candist', 'scripts', 'SCRIPTS',
                     'bin', 'sbin', 'libexec', 'pkgdata',
                     'noinst', 'check');
 
@@ -1811,7 +1811,7 @@ sub handle_scripts
     # Set $scripts_installed if appropriate.  Make sure we only find
     # scripts which are actually installed -- this is why we can't
     # simply use the return value of am_install_var.
-    local (%valid) = &am_primary_prefixes ('SCRIPTS', 'bin', 'sbin',
+    local (%valid) = &am_primary_prefixes ('SCRIPTS', 1, 'bin', 'sbin',
                                           'libexec', 'pkgdata',
                                           'noinst', 'check');
     local ($key);
@@ -2185,9 +2185,9 @@ sub handle_man_pages
 # Handle DATA variables.
 sub handle_data
 {
-    &am_install_var ('-noextra', 'data', 'DATA', 'data', 'sysconf',
-                    'sharedstate', 'localstate', 'pkgdata',
-                    'noinst', 'check');
+    &am_install_var ('-noextra', '-defaultdist', 'data', 'DATA',
+                    'data', 'sysconf', 'sharedstate', 'localstate',
+                    'pkgdata', 'noinst', 'check');
 }
 
 # Handle TAGS.
@@ -3251,7 +3251,7 @@ sub handle_configure
 sub handle_headers
 {
     local (@r);
-    @r = &am_install_var ('header', 'HEADERS', 'include',
+    @r = &am_install_var ('header', '-defaultdist', 'HEADERS', 'include',
                          'oldinclude', 'pkginclude',
                          'noinst', 'check');
     foreach (@r)
@@ -3827,7 +3827,8 @@ sub handle_tests
 # Handle Emacs Lisp.
 sub handle_emacs_lisp
 {
-    local (@elfiles) = &am_install_var ('lisp', 'LISP', 'lisp', 'noinst');
+    local (@elfiles) = &am_install_var ('-candist', 'lisp', 'LISP',
+                                       'lisp', 'noinst');
 
     if (@elfiles)
     {
@@ -3870,7 +3871,8 @@ sub handle_emacs_lisp
 # Handle Java.
 sub handle_java
 {
-    local (@sourcelist) = &am_install_var ('-clean', 'java', 'JAVA',
+    local (@sourcelist) = &am_install_var ('-candist', '-clean',
+                                          'java', 'JAVA',
                                           'java', 'noinst', 'check');
     return if ! @sourcelist;
 
@@ -3880,7 +3882,8 @@ sub handle_java
                      'CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT):$$CLASSPATH');
     &define_variable ('JAVAROOT', '$(top_builddir)');
 
-    local (%valid) = &am_primary_prefixes ('JAVA', 'java', 'noinst', 'check');
+    local (%valid) = &am_primary_prefixes ('JAVA', 1,
+                                          'java', 'noinst', 'check');
 
     local ($dir, $curs);
     foreach $curs (keys %valid)
@@ -6597,28 +6600,30 @@ sub file_contents
 # * `zar_PRIMARY' is a variable.
 sub am_primary_prefixes
 {
-    local ($primary, @prefixes) = @_;
+    local ($primary, $can_dist, @prefixes) = @_;
 
     local (%valid, $varname);
     grep ($valid{$_} = 0, @prefixes);
     $valid{'EXTRA'} = 0;
     foreach $varname (keys %contents)
     {
-       if ($varname =~ /^(.*)_$primary$/)
+       if ($varname =~ /^(dist_|nodist_)?(.*)_$primary$/)
        {
-           if (! defined $valid{$1}
-               && ! &variable_defined ($1 . 'dir')
-               # Note that a configure variable is always legitimate.
-               # It is natural to name such variables after the
-               # primary, so we explicitly allow it.
-               && ! defined $configure_vars{$varname})
+           if (($1 ne '' && ! $can_dist)
+               || (! defined $valid{$2}
+                   && ! &variable_defined ($2 . 'dir')
+                   # Note that a configure variable is always
+                   # legitimate.  It is natural to name such
+                   # variables after the primary, so we explicitly
+                   # allow it.
+                   && ! defined $configure_vars{$varname}))
            {
                &am_line_error ($varname, "invalid variable \`$varname'");
            }
            else
            {
                # Ensure all extended prefixes are actually used.
-               $valid{$1} = 1;
+               $valid{$1 . $2} = 1;
            }
        }
     }
@@ -6643,6 +6648,8 @@ sub am_install_var
 
     local ($do_clean) = 0;
     local ($do_require) = 1;
+    local ($can_dist) = 0;
+    local ($default_dist) = 0;
 
     local ($ltxform);
     if (defined $configure_vars{'LIBTOOL'})
@@ -6676,12 +6683,22 @@ sub am_install_var
        {
            $do_require = 0;
        }
+       elsif ($args[0] eq '-candist')
+       {
+           $can_dist = 1;
+       }
+       elsif ($args[0] eq '-defaultdist')
+       {
+           $default_dist = 1;
+           $can_dist = 1;
+       }
        elsif ($args[0] !~ /^-/)
        {
            last;
        }
        shift (@args);
     }
+
     local ($file, $primary, @prefixes) = @args;
 
     local (@used) = ();
@@ -6702,7 +6719,7 @@ sub am_install_var
     # instance, if the variable "zardir" is defined, then
     # "zar_PROGRAMS" becomes valid.  This is to provide a little extra
     # flexibility in those cases which need it.
-    local (%valid) = &am_primary_prefixes ($primary, @prefixes);
+    local (%valid) = &am_primary_prefixes ($primary, $can_dist, @prefixes);
 
     # If a primary includes a configure substitution, then the EXTRA_
     # form is required.  Otherwise we can't properly do our job.
@@ -6712,11 +6729,27 @@ sub am_install_var
     local ($clean_file) = $file . '-clean';
     local ($one_name);
     local ($X);
+    local ($nodir_name);
     foreach $X (sort keys %valid)
     {
        $one_name = $X . '_' . $primary;
        if (&variable_defined ($one_name))
        {
+           # If files should be distributed, do so.
+           if ($can_dist)
+           {
+               if (($default_dist && $one_name !~ /^nodist_/)
+                   || (! $default_dist && $one_name =~ /^dist_/))
+               {
+                   &push_dist_common ('$(' . $one_name . ')');
+               }
+               ($nodir_name = $X) =~ s/^(dist|nodist)_//;
+           }
+           else
+           {
+               $nodir_name = $X;
+           }
+
            # Append actual contents of where_PRIMARY variable to
            # result.
            local ($rcurs);
@@ -6857,6 +6890,7 @@ sub am_install_var
 
            $output_rules .=
                &file_contents_with_transform ('s/\@DIR\@/' . $X . '/g;'
+                                              . 's/\@NDIR\@/' . $nodir_name . '/go;'
                                               . $ltxform . $cygxform,
                                               $file);
 

diff --git a/data.am b/data.am
index a27780a5fa8fa15278535af8cc3035269497e7a7..416d28797e200e83db9bd9f2ad6d02713415094f 100644 (file)
--- a/data.am
+++ b/data.am
@@ -17,7 +17,7 @@
 ## 02111-1307, USA.
 install-@DIR@DATA: $(@DIR@_DATA)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@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 \
@@ -26,14 +26,14 @@ install-@DIR@DATA: $(@DIR@_DATA)
 ## $(destdir)/bar, not $(destdir)/foo/bar.  The user can always make a
 ## new dir variable for the latter case.
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \
-         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \
+         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
 
 uninstall-@DIR@DATA:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_DATA)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$f"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$f; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done

diff --git a/dist-vars.am b/dist-vars.am
index 4b1c2ecb73d866b5a6c513ecc7799ca01b36cdd7..3d40a79ba8ac510f124d69b22c079a1ab1f0b920 100644 (file)
--- a/dist-vars.am
+++ b/dist-vars.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1999 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -19,4 +19,4 @@ PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
 ## DIST_COMMON comes first so that README can be the very first file.
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST)

diff --git a/header.am b/header.am
index 2dbd931a6f3f1d39e343dff70d1f3c3b5894ea30..3b437d242f992b26b0caebd39bc77e8c80d82e58 100644 (file)
--- a/header.am
+++ b/header.am
@@ -17,21 +17,21 @@
 ## 02111-1307, USA.
 install-@DIR@HEADERS: $(@DIR@_HEADERS)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_HEADERS)'; for p in $$list; do \
 ## A header file can be in the source directory or the build directory.
          if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \
-         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \
+         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
 
 uninstall-@DIR@HEADERS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_HEADERS)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$f"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$f; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done

diff --git a/java.am b/java.am
index fe2ed00401e1ec216662bfec8ec5a707f44cf31d..4d00a8fe9b498098db7a46e204db082302d6d82f 100644 (file)
--- a/java.am
+++ b/java.am
@@ -17,18 +17,18 @@
 ## 02111-1307, USA.
 install-@DIR@JAVA: class@DIR@.stamp
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## A single .java file can be compiled into multiple .class files.  So
 ## we just install all the .class files that got built into this
 ## directory.  This is not optimal, but will have to do for now.
        for p in *.class; do \
-         echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \
-         $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \
+         echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \
+         $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \
        done
 
 uninstall-@DIR@JAVA:
        @$(NORMAL_UNINSTALL)
        @for p in *.class; do \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$p; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \
        done

diff --git a/lib/am/Makefile.am b/lib/am/Makefile.am
index 596a6efae3158ae3797d3d0b0d2821799ca6ac95..beed270c2275808113a2c391b14bcfa7a7057d75 100644 (file)
--- a/lib/am/Makefile.am
+++ b/lib/am/Makefile.am
@@ -18,22 +18,23 @@ ltlib-clean.am ltlib.am ltlibrary.am mans-vars.am mans.am multilib.am \
 program.am progs-clean.am progs.am remake-hdr.am remake.am scripts.am \
 subdirs.am tags-clean.am tags.am texi-vers.am texinfos.am
 
-pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 $(amfiles)
+dist_pkgdata_DATA = COPYING INSTALL texinfo.tex ansi2knr.c ansi2knr.1 \
+$(amfiles)
 
 ## These must all be executable when installed.  However, if we use
 ## _SCRIPTS, then the program transform will be applied, which is not
 ## what we want.  So we make them executable by hand.
 scriptdir = $(pkgdatadir)
-script_DATA = config.guess config.sub install-sh mdate-sh missing \
+dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
 mkinstalldirs elisp-comp ylwrap acinstall
 
 install-data-hook:
-       @for prog in $(script_DATA); do \
-         chmod +x $(scriptdir)/$$prog; \
+       @$(POST_INSTALL)
+       @for prog in $(dist_script_DATA); do \
+         echo " chmod +x $(DESTDIR)$(scriptdir)/$$prog"; \
+         chmod +x $(DESTDIR)$(scriptdir)/$$prog; \
        done
 
-EXTRA_DIST = acinstall $(pkgdata_DATA) $(script_DATA)
-
 # The following requires a fixed version of the Emacs 19.30 etags.
 ETAGS_ARGS = automake.in aclocal.in --lang=none \
  --regex='/^@node[ \t]+\([^,]+\)/\1/' automake.texi
@@ -42,7 +43,7 @@ TAGS_DEPENDENCIES = automake.in aclocal.in automake.texi
 ## `test -x' is not portable.  So we use Perl instead.  If Perl
 ## doesn't exist, then this test is meaningless anyway.
 installcheck-local:
-       for file in $(script_DATA); do \
+       for file in $(dist_script_DATA); do \
          $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \
        done
 

diff --git a/lib/am/data.am b/lib/am/data.am
index a27780a5fa8fa15278535af8cc3035269497e7a7..416d28797e200e83db9bd9f2ad6d02713415094f 100644 (file)
--- a/lib/am/data.am
+++ b/lib/am/data.am
@@ -17,7 +17,7 @@
 ## 02111-1307, USA.
 install-@DIR@DATA: $(@DIR@_DATA)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@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 \
@@ -26,14 +26,14 @@ install-@DIR@DATA: $(@DIR@_DATA)
 ## $(destdir)/bar, not $(destdir)/foo/bar.  The user can always make a
 ## new dir variable for the latter case.
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \
-         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \
+         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
 
 uninstall-@DIR@DATA:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_DATA)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$f"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$f; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done

diff --git a/lib/am/header.am b/lib/am/header.am
index 2dbd931a6f3f1d39e343dff70d1f3c3b5894ea30..3b437d242f992b26b0caebd39bc77e8c80d82e58 100644 (file)
--- a/lib/am/header.am
+++ b/lib/am/header.am
@@ -17,21 +17,21 @@
 ## 02111-1307, USA.
 install-@DIR@HEADERS: $(@DIR@_HEADERS)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_HEADERS)'; for p in $$list; do \
 ## A header file can be in the source directory or the build directory.
          if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \
-         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \
+         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
        done
 
 uninstall-@DIR@HEADERS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_HEADERS)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$f"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$f; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$f; \
        done

diff --git a/lib/am/java.am b/lib/am/java.am
index fe2ed00401e1ec216662bfec8ec5a707f44cf31d..4d00a8fe9b498098db7a46e204db082302d6d82f 100644 (file)
--- a/lib/am/java.am
+++ b/lib/am/java.am
@@ -17,18 +17,18 @@
 ## 02111-1307, USA.
 install-@DIR@JAVA: class@DIR@.stamp
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## A single .java file can be compiled into multiple .class files.  So
 ## we just install all the .class files that got built into this
 ## directory.  This is not optimal, but will have to do for now.
        for p in *.class; do \
-         echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \
-         $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \
+         echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \
+         $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \
        done
 
 uninstall-@DIR@JAVA:
        @$(NORMAL_UNINSTALL)
        @for p in *.class; do \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$p; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \
        done

diff --git a/lib/am/libs.am b/lib/am/libs.am
index 2e28e326bb280d094e1121ac6cd498aaeca452eb..930a8830cfbacd8cec697ceaec21d3ba9c1cba4d 100644 (file)
--- a/lib/am/libs.am
+++ b/lib/am/libs.am
@@ -17,13 +17,13 @@
 ## 02111-1307, USA.
 install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \
-           $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \
+           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \
+           $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \
          else :; fi; \
        done
 ## We do two loops here so that $(POST_INSTALL) can be empty.  If we
@@ -35,14 +35,14 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES)
        @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
 ## Must ranlib after installing because mod time changes.
-           echo " $(RANLIB) $(DESTDIR)$(@DIR@dir)/$$p"; \
-           $(RANLIB) $(DESTDIR)$(@DIR@dir)/$$p; \
+           echo " $(RANLIB) $(DESTDIR)$(@NDIR@dir)/$$p"; \
+           $(RANLIB) $(DESTDIR)$(@NDIR@dir)/$$p; \
          else :; fi; \
        done
 
 uninstall-@DIR@LIBRARIES:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$p; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \
        done

diff --git a/lib/am/lisp.am b/lib/am/lisp.am
index 6cb6a0e1d3ba58d05e359e13c35c3dd249f379ef..2044b0a10e2551d52ecd217e3fdd712fb4f17491 100644 (file)
--- a/lib/am/lisp.am
+++ b/lib/am/lisp.am
@@ -17,19 +17,19 @@
 ## 02111-1307, USA.
 install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_LISP)'; for p in $$list; do \
 ## A header file can be in the source directory or the build directory.
          if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \
-         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \
+         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
 ## Only install .elc file if it exists.
          if test -f $${p}c; then \
-           echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${f}c"; \
-           $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${f}c; \
+           echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@NDIR@dir)/$${f}c"; \
+           $(INSTALL_DATA) $${p}c $(DESTDIR)$(@NDIR@dir)/$${f}c; \
          else : ; fi; \
        done
 
@@ -37,6 +37,6 @@ uninstall-@DIR@LISP:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_LISP)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f $(@DIR@dir)/$$f $(DESTDIR)$(@DIR@dir)/$${f}c"; \
-         rm -f $(@DIR@dir)/$$f $(DESTDIR)$(@DIR@dir)/$${f}c; \
+         echo " rm -f $(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c"; \
+         rm -f $(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c; \
        done

diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index 52fff89929e0cbe8a7c204b514f0e799d7bd9fb9..2dfdb731d970002ebd5fd34c9fd8e54a477d2a07 100644 (file)
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -17,7 +17,7 @@
 ## 02111-1307, USA.
 install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \
@@ -26,14 +26,14 @@ install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES)
 ## if the program doesn't have a name that libtool expects.
 ## Use INSTALL and not INSTALL_DATA because libtool knows the right
 ## permissions to use.
-           echo "@LIBTOOL --mode=install@ $(INSTALL) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \
-           @LIBTOOL --mode=install@ $(INSTALL) $$p $(DESTDIR)$(@DIR@dir)/$$p; \
+           echo "@LIBTOOL --mode=install@ $(INSTALL) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \
+           @LIBTOOL --mode=install@ $(INSTALL) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \
          else :; fi; \
        done
 
 uninstall-@DIR@LTLIBRARIES:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \
-         echo " @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \
-         @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@DIR@dir)/$$p; \
+         echo " @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \
+         @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \
        done

diff --git a/lib/am/progs.am b/lib/am/progs.am
index b573b2064f2ee4316b0f0b7443e59e0f57fcd9f6..061afe334eed2cd9cf414c6b68dc3f939d5e46a0 100644 (file)
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -17,7 +17,7 @@
 ## 02111-1307, USA.
 install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@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 \
@@ -25,8 +25,8 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
 ## Note that we explicitly set the libtool mode.  This avoids any
 ## lossage if the install program doesn't have a name that libtool
 ## expects.
-           echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-           @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \
+           echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
+           @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
 
@@ -34,6 +34,6 @@ uninstall-@DIR@PROGRAMS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \
          file="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$file"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$file; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$file"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$file; \
        done

diff --git a/lib/am/scripts.am b/lib/am/scripts.am
index a0f5c37875ba7c56710afcba7cd2584038a2303d..ae282b5519ed31b5c686832fca524f777f54179e 100644 (file)
--- a/lib/am/scripts.am
+++ b/lib/am/scripts.am
@@ -17,16 +17,16 @@
 ## 02111-1307, USA.
 install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
-           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`"; \
+           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`; \
          else if test -f $(srcdir)/$$p; then \
-           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
-           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`"; \
+           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`; \
          else :; fi; fi; \
        done
 
@@ -34,8 +34,8 @@ uninstall-@DIR@SCRIPTS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \
          file="`echo $$p|sed '$(transform)'`"; \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$file"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$file; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$file"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$file; \
        done
 
 ## Uncomment line in handle_scripts when this is uncommented.

diff --git a/libs.am b/libs.am
index 2e28e326bb280d094e1121ac6cd498aaeca452eb..930a8830cfbacd8cec697ceaec21d3ba9c1cba4d 100644 (file)
--- a/libs.am
+++ b/libs.am
@@ -17,13 +17,13 @@
 ## 02111-1307, USA.
 install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \
-           $(INSTALL_DATA) $$p $(DESTDIR)$(@DIR@dir)/$$p; \
+           echo " $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \
+           $(INSTALL_DATA) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \
          else :; fi; \
        done
 ## We do two loops here so that $(POST_INSTALL) can be empty.  If we
@@ -35,14 +35,14 @@ install-@DIR@LIBRARIES: $(@DIR@_LIBRARIES)
        @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \
          if test -f $$p; then \
 ## Must ranlib after installing because mod time changes.
-           echo " $(RANLIB) $(DESTDIR)$(@DIR@dir)/$$p"; \
-           $(RANLIB) $(DESTDIR)$(@DIR@dir)/$$p; \
+           echo " $(RANLIB) $(DESTDIR)$(@NDIR@dir)/$$p"; \
+           $(RANLIB) $(DESTDIR)$(@NDIR@dir)/$$p; \
          else :; fi; \
        done
 
 uninstall-@DIR@LIBRARIES:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_LIBRARIES)'; for p in $$list; do \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$p; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \
        done

diff --git a/lisp.am b/lisp.am
index 6cb6a0e1d3ba58d05e359e13c35c3dd249f379ef..2044b0a10e2551d52ecd217e3fdd712fb4f17491 100644 (file)
--- a/lisp.am
+++ b/lisp.am
@@ -17,19 +17,19 @@
 ## 02111-1307, USA.
 install-@DIR@LISP: $(@DIR@_LISP) $(ELCFILES)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_LISP)'; for p in $$list; do \
 ## A header file can be in the source directory or the build directory.
          if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f"; \
-         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@DIR@dir)/$$f; \
+         echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f"; \
+         $(INSTALL_DATA) $$d$$p $(DESTDIR)$(@NDIR@dir)/$$f; \
 ## Only install .elc file if it exists.
          if test -f $${p}c; then \
-           echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${f}c"; \
-           $(INSTALL_DATA) $${p}c $(DESTDIR)$(@DIR@dir)/$${f}c; \
+           echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(@NDIR@dir)/$${f}c"; \
+           $(INSTALL_DATA) $${p}c $(DESTDIR)$(@NDIR@dir)/$${f}c; \
          else : ; fi; \
        done
 
@@ -37,6 +37,6 @@ uninstall-@DIR@LISP:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_LISP)'; for p in $$list; do \
          f="`echo $$p | sed -e 's|^.*/||'`"; \
-         echo " rm -f $(@DIR@dir)/$$f $(DESTDIR)$(@DIR@dir)/$${f}c"; \
-         rm -f $(@DIR@dir)/$$f $(DESTDIR)$(@DIR@dir)/$${f}c; \
+         echo " rm -f $(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c"; \
+         rm -f $(@NDIR@dir)/$$f $(DESTDIR)$(@NDIR@dir)/$${f}c; \
        done

diff --git a/ltlib.am b/ltlib.am
index 52fff89929e0cbe8a7c204b514f0e799d7bd9fb9..2dfdb731d970002ebd5fd34c9fd8e54a477d2a07 100644 (file)
--- a/ltlib.am
+++ b/ltlib.am
@@ -17,7 +17,7 @@
 ## 02111-1307, USA.
 install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \
@@ -26,14 +26,14 @@ install-@DIR@LTLIBRARIES: $(@DIR@_LTLIBRARIES)
 ## if the program doesn't have a name that libtool expects.
 ## Use INSTALL and not INSTALL_DATA because libtool knows the right
 ## permissions to use.
-           echo "@LIBTOOL --mode=install@ $(INSTALL) $$p $(DESTDIR)$(@DIR@dir)/$$p"; \
-           @LIBTOOL --mode=install@ $(INSTALL) $$p $(DESTDIR)$(@DIR@dir)/$$p; \
+           echo "@LIBTOOL --mode=install@ $(INSTALL) $$p $(DESTDIR)$(@NDIR@dir)/$$p"; \
+           @LIBTOOL --mode=install@ $(INSTALL) $$p $(DESTDIR)$(@NDIR@dir)/$$p; \
          else :; fi; \
        done
 
 uninstall-@DIR@LTLIBRARIES:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_LTLIBRARIES)'; for p in $$list; do \
-         echo " @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@DIR@dir)/$$p"; \
-         @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@DIR@dir)/$$p; \
+         echo " @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@NDIR@dir)/$$p"; \
+         @LIBTOOL --mode=uninstall@ rm -f $(DESTDIR)$(@NDIR@dir)/$$p; \
        done

diff --git a/m4/Makefile.in b/m4/Makefile.in
index b51f0e0a1dee74ed9ea3ddff4bc82315b7d06a8e..ca3dd9320d8f61e91860be20c8f9ad422b3742ea 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -57,9 +57,11 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+AMTARFLAGS = @AMTARFLAGS@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
+TAR = @TAR@
 VERSION = @VERSION@
 
 
@@ -75,10 +77,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
 DATA =  $(m4data_DATA)
 
-DIST_COMMON =  Makefile.am Makefile.in
+DIST_COMMON =  $(m4data_DATA) Makefile.am Makefile.in
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP_ENV = --best
 all: all-redirect

diff --git a/progs.am b/progs.am
index b573b2064f2ee4316b0f0b7443e59e0f57fcd9f6..061afe334eed2cd9cf414c6b68dc3f939d5e46a0 100644 (file)
--- a/progs.am
+++ b/progs.am
@@ -17,7 +17,7 @@
 ## 02111-1307, USA.
 install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@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 \
@@ -25,8 +25,8 @@ install-@DIR@PROGRAMS: $(@DIR@_PROGRAMS)
 ## Note that we explicitly set the libtool mode.  This avoids any
 ## lossage if the install program doesn't have a name that libtool
 ## expects.
-           echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-           @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \
+           echo " @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
+           @LIBTOOL --mode=install@ $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`; \
          else :; fi; \
        done
 
@@ -34,6 +34,6 @@ uninstall-@DIR@PROGRAMS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_PROGRAMS)'; for p in $$list; do \
          file="`echo $$p|sed -e 's/$(EXEEXT)$$//' -e '$(transform)' -e 's/$$/$(EXEEXT)/'`"; \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$file"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$file; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$file"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$file; \
        done

diff --git a/scripts.am b/scripts.am
index a0f5c37875ba7c56710afcba7cd2584038a2303d..ae282b5519ed31b5c686832fca524f777f54179e 100644 (file)
--- a/scripts.am
+++ b/scripts.am
@@ -17,16 +17,16 @@
 ## 02111-1307, USA.
 install-@DIR@SCRIPTS: $(@DIR@_SCRIPTS)
        @$(NORMAL_INSTALL)
-       $(mkinstalldirs) $(DESTDIR)$(@DIR@dir)
+       $(mkinstalldirs) $(DESTDIR)$(@NDIR@dir)
 ## Funny invocation because Makefile variable can be empty, leading to
 ## a syntax error in sh.
        @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \
          if test -f $$p; then \
-           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
-           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+           echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`"; \
+           $(INSTALL_SCRIPT) $$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`; \
          else if test -f $(srcdir)/$$p; then \
-           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`"; \
-           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@DIR@dir)/`echo $$p|sed '$(transform)'`; \
+           echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`"; \
+           $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(@NDIR@dir)/`echo $$p|sed '$(transform)'`; \
          else :; fi; fi; \
        done
 
@@ -34,8 +34,8 @@ uninstall-@DIR@SCRIPTS:
        @$(NORMAL_UNINSTALL)
        @list='$(@DIR@_SCRIPTS)'; for p in $$list; do \
          file="`echo $$p|sed '$(transform)'`"; \
-         echo " rm -f $(DESTDIR)$(@DIR@dir)/$$file"; \
-         rm -f $(DESTDIR)$(@DIR@dir)/$$file; \
+         echo " rm -f $(DESTDIR)$(@NDIR@dir)/$$file"; \
+         rm -f $(DESTDIR)$(@NDIR@dir)/$$file; \
        done
 
 ## Uncomment line in handle_scripts when this is uncommented.

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5be82d5b381f0e13ffe9708524e9813ddf7ff612..150e15d8f7ff26fe2ee7daa247a93b16edf74b44 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -57,9 +57,11 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+AMTARFLAGS = @AMTARFLAGS@
 MAKEINFO = @MAKEINFO@
 PACKAGE = @PACKAGE@
 PERL = @PERL@
+TAR = @TAR@
 VERSION = @VERSION@
 
 
@@ -74,7 +76,7 @@ CONFIG_CLEAN_FILES =
 DIST_COMMON =  ChangeLog Makefile.am Makefile.in
 
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 GZIP_ENV = --best
 all: all-redirect