diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-04-27 20:03:54 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-04-27 20:03:54 (GMT) |
| commit | 6b23bf89240eeb24f24411f2af96d8c9e19e1e1c (patch) | |
| tree | 70fea80f1ac3f15191e5261b3db13351bd545d4a | |
| parent | c51f3f69f74fc1ff6932e588db5cea2c45d2838b (diff) | |
| download | hdf5-6b23bf89240eeb24f24411f2af96d8c9e19e1e1c.zip hdf5-6b23bf89240eeb24f24411f2af96d8c9e19e1e1c.tar.gz hdf5-6b23bf89240eeb24f24411f2af96d8c9e19e1e1c.tar.bz2 | |
[svn-r3864] Purpose:
Bug Fix
Description:
The "-$(RM)" flags were causing error messages when doing a make
distclean.
Solution:
Removed the "-" from the beginning.
Platforms tested:
Linux
| -rw-r--r-- | fortran/config/conclude.in | 8 | ||||
| -rw-r--r-- | fortran/config/linux-gnulibc1 | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/fortran/config/conclude.in b/fortran/config/conclude.in index 39eb43e..dea5732 100644 --- a/fortran/config/conclude.in +++ b/fortran/config/conclude.in @@ -138,13 +138,13 @@ uninstall-doc: ## mostlyclean: @if test -n "$(LIB_OBJ)"; then \ - -$(RM) $(LIB_OBJ) $(LIB_OBJ:.lo=.o); \ + $(RM) $(LIB_OBJ) $(LIB_OBJ:.lo=.o); \ fi @if test -n "$(TEST_OBJ)"; then \ - -$(RM) $(TEST_OBJ) $(TEST_OBJ:.lo=.o); \ + $(RM) $(TEST_OBJ) $(TEST_OBJ:.lo=.o); \ fi @if test -n "$(PROG_OBJ)" || test -n "$(MOSTLYCLEAN)"; then \ - -$(RM) $(PROG_OBJ) $(PROG_OBJ:.lo=.o) $(MOSTLYCLEAN); \ + $(RM) $(PROG_OBJ) $(PROG_OBJ:.lo=.o) $(MOSTLYCLEAN); \ fi ## Like `mostlyclean' except it also removes the final targets: things like @@ -153,7 +153,7 @@ mostlyclean: ## clean: mostlyclean @if test -n "$(LIB)" -o -n "$(TEST_PROGS)" -o -n "$(PROGS)" -o -n "$(CLEAN)"; then \ - -$(RM) $(LIB) $(TEST_PROGS) $(PROGS) $(CLEAN); \ + $(RM) $(LIB) $(TEST_PROGS) $(PROGS) $(CLEAN); \ fi -$(RM) *.M *.a *.mod -$(RM) -r .libs diff --git a/fortran/config/linux-gnulibc1 b/fortran/config/linux-gnulibc1 index 6765b0b..b24bb85 100644 --- a/fortran/config/linux-gnulibc1 +++ b/fortran/config/linux-gnulibc1 @@ -7,7 +7,7 @@ # See BlankForm in this directory for details. # The default compiler is `gcc'. -if test "X-" = "X-$CC"; then +if test -z "$CC"; then CC=gcc CC_BASENAME=gcc fi @@ -36,11 +36,11 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)' SIZE_T='SELECTED_INT_KIND(R_INTEGER)' OBJECT_NAMELEN_DEFAULT_F=-1 -if test "X-" = "X-$F9X"; then +if test -z "$F9X"; then F9X=pgf90 fi -if test "X-" = "X-$f9x_flags_set"; then +if test -z "$f9x_flags_set"; then FFLAGS= DEBUG_FFLAGS= PROD_FFLAGS= |