From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 7 Dec 2006 07:23:35 +0000 (+0000)
Subject: Fix build failure on case-insensitive file systems.
X-Git-Tag: v1.3.12~46
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=e86f688076f43f3cc5eb44fbe5c4f8ecb126c4f0;p=debian%2Fgzip

Fix build failure on case-insensitive file systems.
* configure.ac: Use match_.s instead of _match.s.
* Makefile.am (MOSTLYCLEANFILES): Likewise.
* lib/Makefile.am (match.$(OBJEXT)): Likewise.
(MOSTLYCLEANFILES): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index fe6b005..fe8b8b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-12-05  Bruno Haible  <bruno@clisp.org>  (tiny change)
+	and Paul Eggert  <eggert@cs.ucla.edu>
+
+	Fix build failure on case-insensitive file systems.
+	* configure.ac: Use match_.s instead of _match.s.
+	* Makefile.am (MOSTLYCLEANFILES): Likewise.
+	* lib/Makefile.am (match.$(OBJEXT)): Likewise.
+	(MOSTLYCLEANFILES): Likewise.
+
 2006-12-06  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* NEWS: Document the fixes below.
diff --git a/Makefile.am b/Makefile.am
index 2bb1954..9ec8c77 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,4 +98,4 @@ uninstall-local: remove-installed-links
 
 MAINTAINERCLEANFILES = gzip.doc
 
-MOSTLYCLEANFILES = _match.s _match.S gzexe zdiff zforce zgrep zless zmore znew
+MOSTLYCLEANFILES = match_.s _match.S gzexe zdiff zforce zgrep zless zmore znew
diff --git a/configure.ac b/configure.ac
index c3271af..11f272e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,15 +59,15 @@ AC_CACHE_CHECK([for assembler], [gzip_cv_assembler],
    *' NO_ASM '*) ;;
    *)
      if cp $srcdir/lib/match.c _match.S &&
-        eval "$ASCPP _match.S > _match.s 2>/dev/null"; then
-       if test ! -s _match.s || grep error < _match.s > /dev/null; then
+	eval "$ASCPP _match.S > match_.s 2>/dev/null"; then
+       if test ! -s match_.s || grep error < match_.s > /dev/null; then
 	 :
-       elif eval "$CC -c _match.s >/dev/null 2>&1" &&
-	    test -f _match.$OBJEXT; then
+       elif eval "$CC -c match_.s >/dev/null 2>&1" &&
+	    test -f match_.$OBJEXT; then
 	 gzip_cv_assembler=yes
        fi
      fi
-     rm -f _match.S _match.s _match.$OBJEXT;;
+     rm -f _match.S match_.s match_.$OBJEXT;;
    esac])
 if test $gzip_cv_assembler = yes; then
   AC_DEFINE(ASMV, ,
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1f5a6d8..f97ca3b 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -27,9 +27,9 @@ LN_S = @LN_S@
 
 match.$(OBJEXT): match.c
 	cp $(srcdir)/match.c _match.S
-	$(ASCPP) _match.S >_match.s
-	$(CC) -c $(CFLAGS) _match.s
-	mv _match.$(OBJEXT) match.$(OBJEXT)
-	rm -f _match.S _match.s
+	$(ASCPP) _match.S > match_.s
+	$(CC) -c $(CFLAGS) match_.s
+	mv match_.$(OBJEXT) $@
+	rm -f _match.S match_.s
 
-MOSTLYCLEANFILES += _match.S _match.s
+MOSTLYCLEANFILES += _match.S match_.s