Mercurial > hg > octave-nkf > gnulib-hg
changeset 3629:e66a47ed08bb
.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Sun, 18 Nov 2001 17:59:36 +0000 |
parents | 319a3c57fe95 |
children | 869d15b9699f |
files | lib/Makefile.in m4/Makefile.in |
diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -48,6 +48,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -205,7 +206,7 @@ libfetish_a_LIBADD = @LIBOBJS@ @ALLOCA@ libfetish_a_DEPENDENCIES = $(libfetish_a_LIBADD) -BUILT_SOURCES = unlocked-io.h getdate.c lstat.c stat.c +BUILT_SOURCES = getdate.c lstat.c stat.c unlocked-io.h MAINTAINERCLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = lstat.c stat.c unlocked-io.h @@ -354,8 +355,6 @@ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu lib/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ AR = ar @@ -861,7 +860,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ $(mkinstalldirs) "$(distdir)/$$dir"; \ @@ -973,6 +972,8 @@ $(srcdir)/xstat.in > $@-t mv $@-t $@ +Makefile: $(BUILT_SOURCES) + # The following is needed in order to install a simple file in $(libdir) # which is shared with other installed packages. We use a list of referencing # packages so that "make uninstall" will remove the file if and only if it
--- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -48,6 +48,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -216,7 +217,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ $(mkinstalldirs) "$(distdir)/$$dir"; \