From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 30 May 2012 08:37:50 +0000 (+0200)
Subject: [ng] fixup: really remove DJGPP support
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45263630bcf83255f6a176cebd10e2ca0dcad618;p=thirdparty%2Fautomake.git

[ng] fixup: really remove DJGPP support

Follow-up on earlier patch 'v1.12-341-gc853c20'.

* lib/am/texinfos.am (uninstall-info-am): Remove support for '*.iNN'
files used on DJGPP.
(maintainer-clean-aminfo): Likewise.
* bootstrap.sh: Adjust comments: we don't use "ln -s" not because
it's not properly supported by DJGPP, but because it might not be
properly supported by MinGW/MSYS.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

diff --git a/bootstrap.sh b/bootstrap.sh
index 0b7096adf..278d118d1 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -64,8 +64,8 @@ if test -d automake-$APIVERSION; then
   find automake-$APIVERSION -exec chmod u+wx '{}' ';'
 fi
 rm -rf automake-$APIVERSION
-# Can't use "ln -s lib automake-$APIVERSION", that would create a
-# lib.exe stub under DJGPP 2.03.
+# Can't use "ln -s lib automake-$APIVERSION", that might not work
+# properly on MinGW/MSYS.
 mkdir automake-$APIVERSION
 cp -rf lib/* automake-$APIVERSION
 
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 7a02232db..c15b729ad 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -312,11 +312,9 @@ uninstall-info-am:
 	@list='$(INFO_DEPS)'; \
 	for file in $$list; do \
 	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
-## DJGPP-style info files.  See comment in install-info-am.
-	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
 	  (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
-	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
-	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
+	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9]"; \
+	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9]; \
 	   else :; fi); \
 	done
 
@@ -388,10 +386,8 @@ clean-aminfo:
 .PHONY maintainer-clean-am: maintainer-clean-aminfo
 maintainer-clean-aminfo:
 	@list='$(INFO_DEPS)'; for i in $$list; do \
-## .iNN files are DJGPP-style info files.
-	  i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
-	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
-	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
+	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9]"; \
+	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9]; \
 	done
 ## Use '-rf', not just '-f', because the %*CLEAN% substitutions can also
 ## contain any directory created by "makeinfo --html".