CVS kaffe (robilad): always force symlinks on installation

PatchSet 7697 
Date: 2008/01/19 19:35:38
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
always force symlinks on installation

2008-01-19  Dalibor Topic  <[email protected]>

* kaffe/scripts/Makefile.am (install-exec-local),
Makefile.am (install-exec-local),
libraries/javalib/Makefile.am (install-data-local):
Always use force option when symlinking. Don't test
for existence of target.

Members: 
	ChangeLog:1.5198->1.5199 
	Makefile.am:1.147->1.148 
	Makefile.in:1.306->1.307 
	kaffe/scripts/Makefile.am:1.23->1.24 
	kaffe/scripts/Makefile.in:1.233->1.234 
	libraries/javalib/Makefile.am:1.466->1.467 
	libraries/javalib/Makefile.in:1.596->1.597 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5198 kaffe/ChangeLog:1.5199
--- kaffe/ChangeLog:1.5198	Sat Jan 19 18:44:48 2008
+++ kaffe/ChangeLog	Sat Jan 19 19:35:38 2008
@@ -1,3 +1,11 @@
+2008-01-19  Dalibor Topic  <[email protected]>
+
+	* kaffe/scripts/Makefile.am (install-exec-local),
+	Makefile.am (install-exec-local),
+	libraries/javalib/Makefile.am (install-data-local):
+	Always use force option when symlinking. Don't test
+	for existence of target.	
+
 2008-01-19  Robert Schuster  <[email protected]>
 
 	* kaffe/scripts/Makefile.am: Add force option to all ln invocations
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.147 kaffe/Makefile.am:1.148
--- kaffe/Makefile.am:1.147	Thu Jan  3 00:48:26 2008
+++ kaffe/Makefile.am	Sat Jan 19 19:35:38 2008
@@ -175,9 +175,7 @@
 	cd test && $(MAKE) check
 
 install-exec-local:
-	if ! test -f $(DESTDIR)${toolslibdir}/tools.jar ; then \
-                $(LN_S) $(CLASSPATH_PREFIX)/share/classpath/tools.zip $(DESTDIR)${toolslibdir}/tools.jar ; \
-        fi
+	$(LN_S) -f $(CLASSPATH_PREFIX)/share/classpath/tools.zip $(DESTDIR)${toolslibdir}/tools.jar
 
 uninstall-local:
 	$(RM) $(DESTDIR)${toolslibdir}/tools.jar 
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.306 kaffe/Makefile.in:1.307
--- kaffe/Makefile.in:1.306	Sat Jan 19 18:23:34 2008
+++ kaffe/Makefile.in	Sat Jan 19 19:35:38 2008
@@ -901,9 +901,7 @@
 	cd test && $(MAKE) check
 
 install-exec-local:
-	if ! test -f $(DESTDIR)${toolslibdir}/tools.jar ; then \
-                $(LN_S) $(CLASSPATH_PREFIX)/share/classpath/tools.zip $(DESTDIR)${toolslibdir}/tools.jar ; \
-        fi
+	$(LN_S) -f $(CLASSPATH_PREFIX)/share/classpath/tools.zip $(DESTDIR)${toolslibdir}/tools.jar
 
 uninstall-local:
 	$(RM) $(DESTDIR)${toolslibdir}/tools.jar 
Index: kaffe/kaffe/scripts/Makefile.am
diff -u kaffe/kaffe/scripts/Makefile.am:1.23 kaffe/kaffe/scripts/Makefile.am:1.24
--- kaffe/kaffe/scripts/Makefile.am:1.23	Sat Jan 19 18:44:49 2008
+++ kaffe/kaffe/scripts/Makefile.am	Sat Jan 19 19:35:39 2008
@@ -43,9 +43,7 @@
 
 install-exec-local:
 	for app in $(CLASSPATH_APPS); do \
-		if ! test -f $(DESTDIR)$(bindir)/$$app ; then \
-			$(LN_S) -f $(CLASSPATH_PREFIX)/bin/g$$app $(DESTDIR)$(bindir)/$$app ; \
-		fi ; \
+		$(LN_S) -f $(CLASSPATH_PREFIX)/bin/g$$app $(DESTDIR)$(bindir)/$$app ; \
 	done
 	if test x"@JAVADOC@" != x"" ; then \
 		$(LN_S) -f @JAVADOC@  $(DESTDIR)$(bindir)/javadoc$(EXEEXT) ; \
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.233 kaffe/kaffe/scripts/Makefile.in:1.234
--- kaffe/kaffe/scripts/Makefile.in:1.233	Sat Jan 19 18:44:50 2008
+++ kaffe/kaffe/scripts/Makefile.in	Sat Jan 19 19:35:40 2008
@@ -681,9 +681,7 @@
 
 install-exec-local:
 	for app in $(CLASSPATH_APPS); do \
-		if ! test -f $(DESTDIR)$(bindir)/$$app ; then \
-			$(LN_S) -f $(CLASSPATH_PREFIX)/bin/g$$app $(DESTDIR)$(bindir)/$$app ; \
-		fi ; \
+		$(LN_S) -f $(CLASSPATH_PREFIX)/bin/g$$app $(DESTDIR)$(bindir)/$$app ; \
 	done
 	if test x"@JAVADOC@" != x"" ; then \
 		$(LN_S) -f @JAVADOC@  $(DESTDIR)$(bindir)/javadoc$(EXEEXT) ; \
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.466 kaffe/libraries/javalib/Makefile.am:1.467
--- kaffe/libraries/javalib/Makefile.am:1.466	Sat Jan 19 18:23:56 2008
+++ kaffe/libraries/javalib/Makefile.am	Sat Jan 19 19:35:40 2008
@@ -37,9 +37,7 @@
 	     logging.properties
 
 install-data-local: installdirs
-	if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
-		$(LN_S) $(TARGET_CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar ; \
-	fi
+	$(LN_S) -f $(TARGET_CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar
 
 uninstall-local:
 	$(RM) $(DESTDIR)${jrelibdir}/rt.jar
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.596 kaffe/libraries/javalib/Makefile.in:1.597
--- kaffe/libraries/javalib/Makefile.in:1.596	Sat Jan 19 18:23:57 2008
+++ kaffe/libraries/javalib/Makefile.in	Sat Jan 19 19:35:41 2008
@@ -646,9 +646,7 @@
 
 
 install-data-local: installdirs
-	if ! test -f $(DESTDIR)${jrelibdir}/rt.jar ; then \
-		$(LN_S) $(TARGET_CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar ; \
-	fi
+	$(LN_S) -f $(TARGET_CLASSPATH_CLASSES) $(DESTDIR)${jrelibdir}/rt.jar
 
 uninstall-local:
 	$(RM) $(DESTDIR)${jrelibdir}/rt.jar