[Winbash-checkins] CVS: winbash/lib/glob Makefile,1.1.1.1,1.2 glob.c,1.2,1.3

[Enrico B. <enr...@us...>]

Update of /cvsroot/winbash/winbash/lib/glob
In directory usw-pr-cvs1:/tmp/cvs-serv6262/lib/glob

Modified Files:
	Makefile glob.c 
Log Message:
Major realignment to 1.14.7

Index: Makefile
===================================================================
RCS file: /cvsroot/winbash/winbash/lib/glob/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- Makefile	9 Mar 2002 03:39:13 -0000	1.1.1.1
+++ Makefile	11 Mar 2002 14:32:15 -0000	1.2
@@ -67,7 +67,8 @@
 	done
 
 documentation: force
-	-(cd doc; $(MAKE) $(MFLAGS))
+	-(cd doc && $(MAKE) $(MFLAGS))
+
 force:
 
 # The rule for 'includes' is written funny so that the if statement
@@ -80,8 +81,10 @@
 
 clean:
 	rm -f $(OBJECTS) $(LIBRARY_NAME)
-	-(cd doc; $(MAKE) $(MFLAGS) clean)
+	-(cd doc && $(MAKE) $(MFLAGS) $@)
 
+maintainer-clean realclean mostlyclean distclean: clean
+	-(cd doc && $(MAKE) $(MFLAGS) $@)
 
 ######################################################################
 #								     #

Index: glob.c
===================================================================
RCS file: /cvsroot/winbash/winbash/lib/glob/glob.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- glob.c	9 Mar 2002 16:05:43 -0000	1.2
+++ glob.c	11 Mar 2002 14:32:15 -0000	1.3
@@ -197,7 +197,6 @@
    Return -1 if cannot access directory DIR.
    Look in errno for more information.  */
 
-
 char **
 glob_vector (pat, dir)
      char *pat;
@@ -436,14 +435,14 @@
       if (directories == NULL)
 	goto memory_error;
       else if (directories == (char **)&glob_error_return)
-      {
- 	free ((char *)result);
- 	return ((char **) &glob_error_return);
-      }
+	{
+	  free ((char *)result);
+	  return ((char **) &glob_error_return);
+	}
       else if (*directories == NULL)
 	{
 	  free ((char *) directories);
- 	  free ((char *) result);
+	  free ((char *) result);
 	  return ((char **) &glob_error_return);
 	}