diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-03-29 00:59:46 +0100 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2009-03-29 00:59:46 +0100 |
| commit | fe936f644680510cf2a0b15ea2942c88204c9566 (patch) | |
| tree | f2b0c0f5ddf95f36795e074afbe15cbd83077044 /m4/Makefile.in | |
| parent | d4cc23b052fda663345c0ac634cc8f07bb6417bb (diff) | |
| parent | 7ff99b75262d5ba025ec79b73cbe00a1e77f2751 (diff) | |
| download | automake-fe936f644680510cf2a0b15ea2942c88204c9566.tar.gz | |
Merge branch 'master' into next
* master:
Rewrite maintainer-check in separate tests, parallelizable.
Fix maintainer-check failure.
Fix latex warning in manual.
Sync auxiliary files from upstream.
manual: minor cleanups.
Sane (un)install for empty directory variables.
Ensure that empty directory variables work with empty content variables.
Use --tag=FC with libtool also for .f90 files.
DISTFILES containing a directory and files in that directory.
Fix a documentation typo.
Define AM_RECURSIVE_TARGETS, for gnulib's GNUmakefile.
Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Diffstat (limited to 'm4/Makefile.in')
| -rw-r--r-- | m4/Makefile.in | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/m4/Makefile.in b/m4/Makefile.in index 808c253ff..d16059467 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -239,7 +239,8 @@ $(am__aclocal_m4_deps): install-dist_m4dataDATA: $(dist_m4data_DATA) @$(NORMAL_INSTALL) test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)" - @list='$(dist_m4data_DATA)'; for p in $$list; do \ + @list='$(dist_m4data_DATA)'; test -n "$(m4datadir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ @@ -250,7 +251,7 @@ install-dist_m4dataDATA: $(dist_m4data_DATA) uninstall-dist_m4dataDATA: @$(NORMAL_UNINSTALL) - @list='$(dist_m4data_DATA)'; \ + @list='$(dist_m4data_DATA)'; test -n "$(m4datadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ test -n "$$files" || exit 0; \ echo " ( cd '$(DESTDIR)$(m4datadir)' && rm -f" $$files ")"; \ @@ -278,10 +279,14 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file "$(distdir)$$dir" || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ test -f "$(distdir)/$$file" \ || cp -p $$d/$$file "$(distdir)/$$file" \ |