From 862cab3e0c1faedff8f8a114667af2d55d3998ef Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 14 May 2001 04:52:43 +0000 Subject: [PATCH] * Makefile.am (dist_pkgdata_DATA): Removed. --- ChangeLog | 2 ++ Makefile.am | 2 -- Makefile.in | 58 ++++++++++++++++------------------------------------- 3 files changed, 19 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94428c4a..a95777c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2001-05-13 Tom Tromey + * Makefile.am (dist_pkgdata_DATA): Removed. + * tests/defs: Find files to copy in lib/. * automake.in (perllibdir): Set to Automake directory. * ansi2knr.c, ansi2knr.1: Removed. diff --git a/Makefile.am b/Makefile.am index b1e6bc08..1cc5db74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,8 +11,6 @@ bin_SCRIPTS = automake aclocal info_TEXINFOS = automake.texi -dist_pkgdata_DATA = COPYING INSTALL - TAGS_FILES = automake.in aclocal.in # The following requires a fixed version of the Emacs 19.30 etags. diff --git a/Makefile.in b/Makefile.in index af355d3f..27f1ed03 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,8 +80,6 @@ SUBDIRS = . m4 lib tests bin_SCRIPTS = automake aclocal info_TEXINFOS = automake.texi -dist_pkgdata_DATA = COPYING INSTALL - TAGS_FILES = automake.in aclocal.in # The following requires a fixed version of the Emacs 19.30 etags. @@ -108,18 +106,15 @@ TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex INFO_DEPS = automake.info DVIS = automake.dvi TEXINFOS = automake.texi -DATA = $(dist_pkgdata_DATA) - RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ uninstall-info-recursive all-recursive install-data-recursive \ install-exec-recursive installdirs-recursive install-recursive \ uninstall-recursive check-recursive installcheck-recursive -DIST_COMMON = README $(dist_pkgdata_DATA) AUTHORS COPYING ChangeLog \ - INSTALL Makefile.am Makefile.in NEWS README-alpha THANKS TODO \ - aclocal.in aclocal.m4 automake.in configure configure.in \ - install-sh mdate-sh missing mkinstalldirs stamp-vti \ - version.texi +DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ + Makefile.in NEWS README-alpha THANKS TODO aclocal.in aclocal.m4 \ + automake.in configure configure.in install-sh mdate-sh missing \ + mkinstalldirs stamp-vti version.texi DIST_SUBDIRS = $(SUBDIRS) all: all-recursive @@ -256,23 +251,6 @@ maintainer-clean-aminfo: rm -f $$i-[0-9]*; \ fi; \ done -install-dist_pkgdataDATA: $(dist_pkgdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) - @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-dist_pkgdataDATA: - @$(NORMAL_UNINSTALL) - @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 # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -457,11 +435,11 @@ distcheck: dist sed 'h;s/./=/g;p;x;p;x' check-am: all-am check: check-recursive -all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA) +all-am: Makefile $(INFO_DEPS) $(SCRIPTS) installdirs: installdirs-recursive installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) $(DESTDIR)$(pkgdatadir) + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(infodir) install: install-recursive install-exec: install-exec-recursive @@ -509,7 +487,7 @@ info: info-recursive info-am: $(INFO_DEPS) -install-data-am: install-dist_pkgdataDATA install-info-am +install-data-am: install-info-am install-exec-am: install-binSCRIPTS @@ -549,8 +527,7 @@ mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti -uninstall-am: uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \ - uninstall-info-am +uninstall-am: uninstall-binSCRIPTS uninstall-info-am uninstall-info: uninstall-info-recursive @@ -560,16 +537,15 @@ uninstall-info: uninstall-info-recursive distclean-recursive distclean-tags distdir dvi dvi-am \ dvi-recursive info info-am info-recursive install install-am \ install-binSCRIPTS install-data install-data-am \ - install-data-recursive install-dist_pkgdataDATA install-exec \ - install-exec-am install-exec-recursive install-info \ - install-info-recursive install-man install-recursive \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am installdirs-recursive maintainer-clean \ - maintainer-clean-aminfo maintainer-clean-generic \ - maintainer-clean-recursive maintainer-clean-vti mostlyclean \ - mostlyclean-aminfo mostlyclean-generic mostlyclean-recursive \ - mostlyclean-vti tags tags-recursive uninstall uninstall-am \ - uninstall-binSCRIPTS uninstall-dist_pkgdataDATA \ + install-data-recursive install-exec install-exec-am \ + install-exec-recursive install-info install-info-recursive \ + install-man install-recursive install-strip installcheck \ + installcheck-am installdirs installdirs-am \ + installdirs-recursive maintainer-clean maintainer-clean-aminfo \ + maintainer-clean-generic maintainer-clean-recursive \ + maintainer-clean-vti mostlyclean mostlyclean-aminfo \ + mostlyclean-generic mostlyclean-recursive mostlyclean-vti tags \ + tags-recursive uninstall uninstall-am uninstall-binSCRIPTS \ uninstall-info-recursive uninstall-recursive -- 2.43.5