[csw-devel] SF.net SVN: gar:[7704] csw/mgar/pkg/subversion/trunk

[rthurner at users.sourceforge.net]

Revision: 7704
          http://gar.svn.sourceforge.net/gar/?rev=7704&view=rev
Author:   rthurner
Date:     2009-12-21 22:11:47 +0000 (Mon, 21 Dec 2009)

Log Message:
-----------
subversion - remove libsvn_ra_dav again, the link should be created in the Makefile

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile

Removed Paths:
-------------
    csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i
    csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2009-12-21 21:14:50 UTC (rev 7703)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2009-12-21 22:11:47 UTC (rev 7704)
@@ -73,8 +73,6 @@
 DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove
 DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW
 DISTFILES += fixme.sh
-DISTFILES += libsvn_ra_dav-1.so.0.0.0.i
-DISTFILES += libsvn_ra_dav-1.so.0.0.0.s
 
 # Fix: Add java headers for nested classes
 # https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html
@@ -174,10 +172,8 @@
 	@# libsvn_ra_dav-1* has been renamed to libsvn_ra_neon-1* 
 	@# in the new versions of subversion, 
 	@# we need to link for backward compatability
-	@(gln -s $(DESTDIR)$(libdir)/libsvn_ra_neon-1.so.0.0.0 \
-		$(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0)
-	@(gln -s $(DESTDIR)$(libdir)/libsvn_ra_neon-1.so.0.0.0 \
-		$(DESTDIR)$(libdir)/libsvn_ra_dav-1.so)
+	@(gln -s libsvn_ra_neon-1.so.0.0.0 $(DESTDIR)$(SVNLIB)/libsvn_ra_dav-1.so.0)
+	@(gln -s libsvn_ra_neon-1.so.0.0.0 $(DESTDIR)$(SVNLIB)/libsvn_ra_dav-1.so)
 	@$(MAKECOOKIE)
 
 install-extras:
@@ -220,14 +216,3 @@
 	$(BUILD_ENV)   gmake -C $(WORKSRC) javahl;
 	$(INSTALL_ENV) gmake -C $(WORKSRC) install-javahl;
 	$(MAKECOOKIE)
-
-post-install-isa-sparcv8:
-	ginstall $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.s $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0
-	ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0
-	@$(MAKECOOKIE)
-
-post-install-isa-i386:
-	cp $(FILEDIR)/libsvn_ra_dav-1.so.0.0.0.i $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0.0.0
-	ln -s libsvn_ra_dav-1.so.0.0.0 $(DESTDIR)$(libdir)/libsvn_ra_dav-1.so.0
-	@$(MAKECOOKIE)
-

Deleted: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.i
===================================================================
(Binary files differ)

Deleted: csw/mgar/pkg/subversion/trunk/files/libsvn_ra_dav-1.so.0.0.0.s
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.