From 8ff42f9ba1fbf99abbdecbcac57047cd1aeef663 Mon Sep 17 00:00:00 2001 From: Lyndon Tremblay Date: Wed, 3 Nov 1999 08:39:18 +0000 Subject: [PATCH] Fixed some complications git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@5127 72102866-910b-0410-8b05-ffd578937521 --- rules.make | 2 +- target.make | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rules.make b/rules.make index 18ea946b..c4b9f398 100644 --- a/rules.make +++ b/rules.make @@ -172,7 +172,7 @@ $(GNUSTEP_OBJ_DIR)/%${OEXT} : %.m $(CC) -c $(ALL_CPPFLAGS) $(ALL_OBJCFLAGS) -o $@ $< $(JAVA_OBJ_PREFIX)%.class : %.java - if [ $< -nt $(JAVA_OBJ_PREFIX)/`(grep \"package\" $< | awk '{ print $$2 }') | sed -e "s/\./\//g" -e "s/\;//"`/$@ ]; then \ + if [ $< -nt $(JAVA_OBJ_PREFIX)/`(grep package $< | awk '{ print $$2 }') | sed -e "s/\./\//g" -e "s/\;//"`/$@ -o ! -f $(JAVA_OBJ_PREFIX)/`(grep package $< | awk '{ print $$2 }') | sed -e "s/\./\//g" -e "s/\;//"`/$@ ]; then \ $(JAVAC) $(ALL_JAVAFLAGS) $< -d $(JAVA_OBJ_PREFIX); \ fi diff --git a/target.make b/target.make index 85736f65..0711e4dc 100644 --- a/target.make +++ b/target.make @@ -272,7 +272,7 @@ SHARED_LIB_LINK_CMD = \ $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \ $(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \ if [ x$(LIBRARY_NAME_SUFFIX) = x_d ]; then \ - $(LN_S) $(LIBRARY_FILE) `echo $(LIBRARY_FILE) | sed -e 's/_d//'`; \ + $(LN_S) -f $(LIBRARY_FILE) `echo $(LIBRARY_FILE) | sed -e 's/_d//'`; \ fi; \ ) AFTER_INSTALL_SHARED_LIB_COMMAND = \ @@ -281,7 +281,7 @@ AFTER_INSTALL_SHARED_LIB_COMMAND = \ $(LN_S) $(VERSION_LIBRARY_FILE) $(SONAME_LIBRARY_FILE); \ $(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \ if [ x$(LIBRARY_NAME_SUFFIX) = x_d ]; then \ - $(LN_S) $(LIBRARY_FILE) `echo $(LIBRARY_FILE) | sed -e 's/_d//'`; \ + $(LN_S) -f $(LIBRARY_FILE) `echo $(LIBRARY_FILE) | sed -e 's/_d//'`; \ fi; \ ) OBJ_MERGE_CMD = \