Bug fix for Solaris 2.4

diff --git a/ChangeLog b/ChangeLog
index 5bd9ede..387a310 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jul  5 08:23:00 1996  Tom Tromey  <tromey@creche.cygnus.com>
+
+       * programs-clean.am (clean-@DIR@PROGRAMS): Work around failing
+       Solaris "rm -f".  Bug from Kaveh R. Ghazi.
+       * libraries-clean.am (clean-@DIR@LIBRARIES): Likewise.
+
 Fri Jun 21 10:42:06 1996  Tom Tromey  <tromey@creche.cygnus.com>
 
        * texinfos.am (install-info): Use "if", not "&&", to avoid

diff --git a/TODO b/TODO
index 9780c12..2d8ac8e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -4,9 +4,6 @@ Priorities for release:
 ** Consider using implicit .y.c and .l.c rules instead of current
    lex/yacc trickery
 
-add new flag to only remake Makefile.in's that are old.  use this in
-autoreconf.
-
 add support for Makefile.tmpl that is auto-included in every
 Makefile.am.  That makes it easier to do some non-std thing in every
 subdirectory.

diff --git a/clean.am b/clean.am
index 81729da..f716d28 100644 (file)
--- a/clean.am
+++ b/clean.am
@@ -15,8 +15,10 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-## We must test each macro because it might be empty, and an empty
-## "rm -rf" command looks disturbing.
+
+## We must test each macro because it might be empty, and an empty "rm
+## -rf" command looks disturbing.  Also, the Solaris 2.4 "rm" will
+## return an error if there are no arguments other than "-f".
 mostlyclean-generic:
        test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 

diff --git a/lib/am/clean.am b/lib/am/clean.am
index 81729da..f716d28 100644 (file)
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -15,8 +15,10 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-## We must test each macro because it might be empty, and an empty
-## "rm -rf" command looks disturbing.
+
+## We must test each macro because it might be empty, and an empty "rm
+## -rf" command looks disturbing.  Also, the Solaris 2.4 "rm" will
+## return an error if there are no arguments other than "-f".
 mostlyclean-generic:
        test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 

diff --git a/libraries-clean.am b/libraries-clean.am
index 08999da..aadfac6 100644 (file)
--- a/libraries-clean.am
+++ b/libraries-clean.am
@@ -18,7 +18,7 @@
 mostlyclean-@DIR@LIBRARIES:
 
 clean-@DIR@LIBRARIES:
-       rm -f $(@DIR@_LIBFILES)
+       test -z "$(@DIR@_LIBFILES)" || rm -f $(@DIR@_LIBFILES)
 
 distclean-@DIR@LIBRARIES:
 

diff --git a/programs-clean.am b/programs-clean.am
index 385c07b..cfe84d0 100644 (file)
--- a/programs-clean.am
+++ b/programs-clean.am
@@ -18,7 +18,7 @@
 mostlyclean-@DIR@PROGRAMS:
 
 clean-@DIR@PROGRAMS:
-       rm -f $(@DIR@_PROGRAMS)
+       test -z "$(@DIR@_PROGRAMS)" || rm -f $(@DIR@_PROGRAMS)
 
 distclean-@DIR@PROGRAMS: