| 1 |
jlec 10/07/03 09:25:03 |
| 2 |
|
| 3 |
Modified: 6.1.3-noinstall.patch |
| 4 |
Log: |
| 5 |
Fixed file collision |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.3 sci-libs/ccp4-libs/files/6.1.3-noinstall.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch?rev=1.3&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch?rev=1.3&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch?r1=1.2&r2=1.3 |
| 14 |
|
| 15 |
Index: 6.1.3-noinstall.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch,v |
| 18 |
retrieving revision 1.2 |
| 19 |
retrieving revision 1.3 |
| 20 |
diff -u -r1.2 -r1.3 |
| 21 |
--- 6.1.3-noinstall.patch 3 Jul 2010 08:06:25 -0000 1.2 |
| 22 |
+++ 6.1.3-noinstall.patch 3 Jul 2010 09:25:03 -0000 1.3 |
| 23 |
@@ -74,7 +74,7 @@ |
| 24 |
|
| 25 |
uninstall : |
| 26 |
diff --git a/lib/data/Makefile.in b/lib/data/Makefile.in |
| 27 |
-index cc25c5c..f51ccbe 100755 |
| 28 |
+index cc25c5c..017502d 100755 |
| 29 |
--- a/lib/data/Makefile.in |
| 30 |
+++ b/lib/data/Makefile.in |
| 31 |
@@ -30,9 +30,9 @@ font84.dat : fontpack $(srcdir)/font84.ascii |
| 32 |
@@ -91,7 +91,7 @@ |
| 33 |
uninstall : |
| 34 |
-rm -f $(libdir)/font84.dat |
| 35 |
diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in |
| 36 |
-index b32dd1e..cfa8852 100755 |
| 37 |
+index b32dd1e..6aa107d 100755 |
| 38 |
--- a/lib/src/Makefile.in |
| 39 |
+++ b/lib/src/Makefile.in |
| 40 |
@@ -685,7 +685,7 @@ testlib : $(srcdir)/testlib.f $(LF) |
| 41 |
@@ -103,14 +103,16 @@ |
| 42 |
@list='$(ccp4_HEADERS)'; for p in $$list; do \ |
| 43 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 44 |
f="`echo $$p | sed -e 's|^.*/||'`"; \ |
| 45 |
-@@ -717,10 +717,10 @@ uninstall-mmdbHEADERS: |
| 46 |
+@@ -716,11 +716,11 @@ uninstall-mmdbHEADERS: |
| 47 |
+ rm -f $(DESTDIR)$(includedir)/mmdb/$$f; \ |
| 48 |
done |
| 49 |
|
| 50 |
- install : all install-ccp4HEADERS install-mmdbHEADERS |
| 51 |
+-install : all install-ccp4HEADERS install-mmdbHEADERS |
| 52 |
- $(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC) |
| 53 |
- $(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF) |
| 54 |
- $(RANLIB) $(libdir)/$(LC) |
| 55 |
- $(RANLIB) $(libdir)/$(LF) |
| 56 |
++install : all install-ccp4HEADERS |
| 57 |
+ $(RANLIB) $(LC) |
| 58 |
+ $(RANLIB) $(LF) |
| 59 |
+ $(INSTALL_DATA) `pwd`/$(LC) $(DESTDIR)/$(libdir)/$(LC) |
Archives