automake
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

uninstall-info fails


From: Akim Demaille
Subject: uninstall-info fails
Date: 18 May 2001 15:50:58 +0200
User-agent: Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.1 (Cuyahoga Valley)

On my Debian system, distcheck fails because of uninstall-info-am:
here install-info is in /usr/sbin, which I don't have in my path.  In
other words, unless I'm root, there is no install-info.


Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * lib/am/texinfos.am (install-info-am, uninstall-info-am): Be robust
        to missing `install-info'.

Index: lib/am/texinfos.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/texinfos.am,v
retrieving revision 1.88
diff -u -u -r1.88 texinfos.am
--- lib/am/texinfos.am 2001/05/15 02:49:51 1.88
+++ lib/am/texinfos.am 2001/05/18 13:36:59
@@ -123,7 +123,13 @@
 ## the Debian install-info.  FIXME: once Debian install-info goes
 ## away, we can remove this hack.  Debian install-info v1.8.3
 ## prints version info to stderr.
-       @if $(SHELL) -c 'install-info --version 2>&1 | sed 1q | fgrep -s -v -i 
debian' >/dev/null 2>&1; then \
+##
+## Do not use
+##    install-info --version 2>&1 | sed 1q | fgrep -s -v -i debian
+## as if install-info does not exist, fgrep -v will be happy, and
+## therefore the code will be triggered although install-info is missing.
+       @if (install-info --version && \
+            install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then 
\
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
 ## Run `:' after install-info in case install-info fails.  We really
@@ -136,7 +142,7 @@
 ## fails then we'd fail if we used `;'.
            install-info --info-dir=$(DESTDIR)$(infodir) 
$(DESTDIR)$(infodir)/$$file || :;\
          done; \
-       else : ; fi
+       else :; fi
 else ! %?LOCAL-TEXIS%
 install-info-am:
 endif ! %?LOCAL-TEXIS%
@@ -157,7 +163,8 @@
 ## Run two loops here so that we can handle PRE_UNINSTALL and
 ## NORMAL_UNINSTALL correctly.  Debian install-info v1.8.3 prints
 ## version info to stderr.
-       @if $(SHELL) -c 'install-info --version 2>&1 | sed 1q | fgrep -s -v -i 
debian' >/dev/null 2>&1; then \
+       @if (install-info --version && \
+            install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then 
\
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
 ## install-info needs the actual info file.  We use the installed one,
Index: Makefile.in
===================================================================
RCS file: /cvs/automake/automake/Makefile.in,v
retrieving revision 1.324
diff -u -u -r1.324 Makefile.in
--- Makefile.in 2001/05/16 05:17:04 1.324
+++ Makefile.in 2001/05/18 13:36:58
@@ -131,9 +131,6 @@

 $(ACLOCAL_M4):  configure.in
        cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-maintainer-clean-conf:
-       -rm -f configure aclocal.m4
 automake: $(top_builddir)/config.status automake.in
        cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_LINKS= 
$(SHELL) ./config.status
 aclocal: $(top_builddir)/config.status aclocal.in
@@ -205,7 +202,8 @@

 uninstall-info-am:
        $(PRE_UNINSTALL)
-       @if $(SHELL) -c 'install-info --version 2>&1 | sed 1q | fgrep -s -v -i 
debian' >/dev/null 2>&1; then \
+       @if (install-info --version && \
+            install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then 
\
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
            echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove 
$(DESTDIR)$(infodir)/$$file"; \
@@ -446,7 +444,8 @@
 installcheck: installcheck-recursive
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:
@@ -457,7 +456,6 @@
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-       -rm -f Makefile.in
 clean: clean-recursive

 clean-am: clean-generic mostlyclean-am
@@ -498,13 +496,14 @@
          done; \
        done
        @$(POST_INSTALL)
-       @if $(SHELL) -c 'install-info --version 2>&1 | sed 1q | fgrep -s -v -i 
debian' >/dev/null 2>&1; then \
+       @if (install-info --version && \
+            install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then 
\
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
            echo " install-info --info-dir=$(DESTDIR)$(infodir) 
$(DESTDIR)$(infodir)/$$file";\
            install-info --info-dir=$(DESTDIR)$(infodir) 
$(DESTDIR)$(infodir)/$$file || :;\
          done; \
-       else : ; fi
+       else :; fi
 install-man:

 installcheck-am:
@@ -512,8 +511,7 @@
 maintainer-clean: maintainer-clean-recursive

 maintainer-clean-am: distclean-am maintainer-clean-aminfo \
-       maintainer-clean-conf maintainer-clean-generic \
-       maintainer-clean-vti
+       maintainer-clean-generic maintainer-clean-vti

 mostlyclean: mostlyclean-recursive

Index: lib/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/lib/Makefile.in,v
retrieving revision 1.5
diff -u -u -r1.5 Makefile.in
--- lib/Makefile.in 2001/05/14 04:48:45 1.5
+++ lib/Makefile.in 2001/05/18 13:36:58
@@ -13,7 +13,6 @@

 @SET_MAKE@

-
 SHELL = @SHELL@

 srcdir = @srcdir@
@@ -34,11 +33,9 @@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..

 ACLOCAL = @ACLOCAL@
@@ -52,7 +49,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -89,7 +85,8 @@
 DATA = $(dist_pkgdata_DATA) $(dist_script_DATA)


-RECURSIVE_TARGETS = all-recursive install-data-recursive \
+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 = $(dist_pkgdata_DATA) $(dist_script_DATA) COPYING INSTALL \
@@ -100,15 +97,14 @@
 all: all-recursive

 .SUFFIXES:
-
 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnits  lib/Makefile
-
+         $(AUTOMAKE) --gnu  lib/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
@@ -243,7 +239,7 @@

 distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
-         d=$(srcdir); \
+         if test -f $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
            $(mkinstalldirs) "$(distdir)/$$dir"; \
@@ -273,7 +269,6 @@
 check-am: all-am
 check: check-recursive
 all-am: Makefile $(DATA)
-
 installdirs: installdirs-recursive
 installdirs-am:
        $(mkinstalldirs) $(DESTDIR)$(pkgdatadir) $(DESTDIR)$(scriptdir)
@@ -287,23 +282,20 @@
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

 installcheck: installcheck-recursive
-
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:

 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
-       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-       -rm -f Makefile.in
 clean: clean-recursive

 clean-am: clean-generic mostlyclean-am
@@ -312,11 +304,11 @@

 distclean-am: clean-am distclean-generic distclean-tags

-dvi:
+dvi: dvi-recursive

 dvi-am:

-info:
+info: info-recursive

 info-am:

@@ -326,7 +318,7 @@

 install-exec-am:

-install-info:
+install-info: install-info-recursive

 install-man:

@@ -340,22 +332,27 @@

 mostlyclean-am: mostlyclean-generic

-uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA
+uninstall-am: uninstall-dist_pkgdataDATA uninstall-dist_scriptDATA \
+       uninstall-info-am

+uninstall-info: uninstall-info-recursive
+
 .PHONY: $(RECURSIVE_TARGETS) all all-am check check-am clean \
        clean-generic clean-recursive distclean distclean-generic \
-       distclean-recursive distclean-tags distdir dvi dvi-am info \
-       info-am install install-am install-data install-data-am \
-       install-data-recursive install-dist_pkgdataDATA \
-       install-dist_scriptDATA install-exec install-exec-am \
-       install-exec-recursive install-info install-man \
-       install-recursive install-strip installcheck installcheck-am \
-       installcheck-local installdirs installdirs-am \
-       installdirs-recursive maintainer-clean maintainer-clean-generic \
+       distclean-recursive distclean-tags distdir dvi dvi-am \
+       dvi-recursive info info-am info-recursive install install-am \
+       install-data install-data-am install-data-recursive \
+       install-dist_pkgdataDATA install-dist_scriptDATA install-exec \
+       install-exec-am install-exec-recursive install-info \
+       install-info-recursive install-man install-recursive \
+       install-strip installcheck installcheck-am installcheck-local \
+       installdirs installdirs-am installdirs-recursive \
+       maintainer-clean maintainer-clean-generic \
        maintainer-clean-recursive mostlyclean mostlyclean-generic \
        mostlyclean-recursive tags tags-recursive uninstall \
        uninstall-am uninstall-dist_pkgdataDATA \
-       uninstall-dist_scriptDATA uninstall-recursive
+       uninstall-dist_scriptDATA uninstall-info-recursive \
+       uninstall-recursive


 install-data-hook:
@@ -369,7 +366,6 @@
        for file in $(dist_script_DATA); do \
          $(PERL) -e "exit ! -x '$(pkgdatadir)/$$file';" || exit 1; \
        done
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
Index: lib/Automake/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/lib/Automake/Makefile.in,v
retrieving revision 1.4
diff -u -u -r1.4 Makefile.in
--- lib/Automake/Makefile.in 2001/05/14 04:48:45 1.4
+++ lib/Automake/Makefile.in 2001/05/18 13:36:58
@@ -13,7 +13,6 @@

 @SET_MAKE@

-
 SHELL = @SHELL@

 srcdir = @srcdir@
@@ -34,11 +33,9 @@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..

 ACLOCAL = @ACLOCAL@
@@ -52,7 +49,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -86,15 +82,14 @@
 all: all-am

 .SUFFIXES:
-
 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnits  lib/Automake/Makefile
-
+         $(AUTOMAKE) --gnu  lib/Automake/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 install-dist_perllibDATA: $(dist_perllib_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(perllibdir)
@@ -123,7 +118,7 @@

 distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
-         d=$(srcdir); \
+         if test -f $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
            $(mkinstalldirs) "$(distdir)/$$dir"; \
@@ -153,23 +148,20 @@
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

 installcheck: installcheck-am
-
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:

 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
-       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-       -rm -f Makefile.in
 clean: clean-am

 clean-am: clean-generic mostlyclean-am
@@ -178,11 +170,11 @@

 distclean-am: clean-am distclean-generic

-dvi:
+dvi: dvi-am

 dvi-am:

-info:
+info: info-am

 info-am:

@@ -190,7 +182,7 @@

 install-exec-am:

-install-info:
+install-info: install-info-am

 install-man:

@@ -204,17 +196,19 @@

 mostlyclean-am: mostlyclean-generic

-uninstall-am: uninstall-dist_perllibDATA
+uninstall-am: uninstall-dist_perllibDATA uninstall-info-am

+uninstall-info: uninstall-info-am
+
 .PHONY: all all-am check check-am clean clean-generic distclean \
        distclean-generic distdir dvi dvi-am info info-am install \
        install-am install-data install-data-am \
        install-dist_perllibDATA install-exec install-exec-am \
-       install-info install-man install-strip installcheck \
-       installcheck-am installdirs maintainer-clean \
+       install-info install-info-am install-man install-strip \
+       installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic \
-       uninstall uninstall-am uninstall-dist_perllibDATA
-
+       uninstall uninstall-am uninstall-dist_perllibDATA \
+       uninstall-info-am

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Index: lib/am/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/lib/am/Makefile.in,v
retrieving revision 1.1
diff -u -u -r1.1 Makefile.in
--- lib/am/Makefile.in 2001/05/14 04:48:45 1.1
+++ lib/am/Makefile.in 2001/05/18 13:36:58
@@ -13,7 +13,6 @@

 @SET_MAKE@

-
 SHELL = @SHELL@

 srcdir = @srcdir@
@@ -34,11 +33,9 @@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..

 ACLOCAL = @ACLOCAL@
@@ -52,7 +49,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -94,15 +90,14 @@
 all: all-am

 .SUFFIXES:
-
 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && \
-         $(AUTOMAKE) --gnits  lib/am/Makefile
-
+         $(AUTOMAKE) --gnu  lib/am/Makefile
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 install-dist_amDATA: $(dist_am_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(amdir)
@@ -131,7 +126,7 @@

 distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
-         d=$(srcdir); \
+         if test -f $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
            $(mkinstalldirs) "$(distdir)/$$dir"; \
@@ -161,23 +156,20 @@
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

 installcheck: installcheck-am
-
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:

 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
-       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-       -rm -f Makefile.in
 clean: clean-am

 clean-am: clean-generic mostlyclean-am
@@ -186,11 +178,11 @@

 distclean-am: clean-am distclean-generic

-dvi:
+dvi: dvi-am

 dvi-am:

-info:
+info: info-am

 info-am:

@@ -198,7 +190,7 @@

 install-exec-am:

-install-info:
+install-info: install-info-am

 install-man:

@@ -212,17 +204,18 @@

 mostlyclean-am: mostlyclean-generic

-uninstall-am: uninstall-dist_amDATA
+uninstall-am: uninstall-dist_amDATA uninstall-info-am

+uninstall-info: uninstall-info-am
+
 .PHONY: all all-am check check-am clean clean-generic distclean \
        distclean-generic distdir dvi dvi-am info info-am install \
        install-am install-data install-data-am install-dist_amDATA \
-       install-exec install-exec-am install-info install-man \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic uninstall uninstall-am \
-       uninstall-dist_amDATA
-
+       install-exec install-exec-am install-info install-info-am \
+       install-man install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic uninstall uninstall-am \
+       uninstall-dist_amDATA uninstall-info-am

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
Index: m4/Makefile.in
===================================================================
RCS file: /cvs/automake/automake/m4/Makefile.in,v
retrieving revision 1.146
diff -u -u -r1.146 Makefile.in
--- m4/Makefile.in 2001/05/14 04:48:45 1.146
+++ m4/Makefile.in 2001/05/18 13:36:59
@@ -13,7 +13,6 @@

 @SET_MAKE@

-
 SHELL = @SHELL@

 srcdir = @srcdir@
@@ -34,11 +33,9 @@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..

 ACLOCAL = @ACLOCAL@
@@ -52,7 +49,6 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = @program_transform_name@
-
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
@@ -96,15 +92,14 @@
 all: all-am

 .SUFFIXES:
-
 $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && \
          $(AUTOMAKE) --gnits  m4/Makefile
-
 Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) && \
          CONFIG_HEADERS= CONFIG_LINKS= \
          CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status
+uninstall-info-am:
 install-m4dataDATA: $(m4data_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(m4datadir)
@@ -133,7 +128,7 @@

 distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
-         d=$(srcdir); \
+         if test -f $$file; then d=.; else d=$(srcdir); fi; \
          dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
          if test "$$dir" != "$$file" && test "$$dir" != "."; then \
            $(mkinstalldirs) "$(distdir)/$$dir"; \
@@ -163,23 +158,20 @@
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am

 installcheck: installcheck-am
-
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         INSTALL_PROGRAM_ENV='$(INSTALL_STRIP_PROGRAM_ENV)' install
-
+         `test -z '$(STRIP)' || \
+           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:

 clean-generic:

 distclean-generic:
-       -rm -f Makefile $(CONFIG_CLEAN_FILES)
-       -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+       -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*

 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-       -rm -f Makefile.in
 clean: clean-am

 clean-am: clean-generic mostlyclean-am
@@ -188,11 +180,11 @@

 distclean-am: clean-am distclean-generic

-dvi:
+dvi: dvi-am

 dvi-am:

-info:
+info: info-am

 info-am:

@@ -200,7 +192,7 @@

 install-exec-am:

-install-info:
+install-info: install-info-am

 install-man:

@@ -214,16 +206,18 @@

 mostlyclean-am: mostlyclean-generic

-uninstall-am: uninstall-m4dataDATA
+uninstall-am: uninstall-info-am uninstall-m4dataDATA

+uninstall-info: uninstall-info-am
+
 .PHONY: all all-am check check-am clean clean-generic distclean \
        distclean-generic distdir dvi dvi-am info info-am install \
        install-am install-data install-data-am install-exec \
-       install-exec-am install-info install-m4dataDATA install-man \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-generic uninstall uninstall-am uninstall-m4dataDATA
-
+       install-exec-am install-info install-info-am install-m4dataDATA \
+       install-man install-strip installcheck installcheck-am \
+       installdirs maintainer-clean maintainer-clean-generic \
+       mostlyclean mostlyclean-generic uninstall uninstall-am \
+       uninstall-info-am uninstall-m4dataDATA

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]