| 1 |
jlec 10/07/03 08:06:25 |
| 2 |
|
| 3 |
Modified: 6.1.3-noinstall.patch |
| 4 |
Log: |
| 5 |
Fix installation Problem of missing with missing libccif |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 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.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/ccp4-libs/files/6.1.3-noinstall.patch?rev=1.2&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.1&r2=1.2 |
| 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.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- 6.1.3-noinstall.patch 29 Jun 2010 19:55:41 -0000 1.1 |
| 22 |
+++ 6.1.3-noinstall.patch 3 Jul 2010 08:06:25 -0000 1.2 |
| 23 |
@@ -74,7 +74,7 @@ |
| 24 |
|
| 25 |
uninstall : |
| 26 |
diff --git a/lib/data/Makefile.in b/lib/data/Makefile.in |
| 27 |
-index cc25c5c..7445ca5 100755 |
| 28 |
+index cc25c5c..f51ccbe 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 |
@@ -82,15 +82,16 @@ |
| 33 |
install : all |
| 34 |
-rm -f font84.dat |
| 35 |
- test -f font84.ascii || $(LNS) $(srcdir)/font84.ascii . |
| 36 |
-+ test -f font84.ascii || $(LNS) $(DESTIDIR)/$(srcdir)/font84.ascii . |
| 37 |
- ./fontpack |
| 38 |
+- ./fontpack |
| 39 |
- $(INSTALL) `pwd`/font84.dat $(libdir)/font84.dat |
| 40 |
++ test -f font84.ascii || $(LNS) $(DESTDIR)/$(srcdir)/font84.ascii . |
| 41 |
++ LD_LIBRARY_PATH="../src:../ccif" ./fontpack |
| 42 |
+ $(INSTALL) `pwd`/font84.dat $(DESTDIR)/$(libdir)/font84.dat |
| 43 |
|
| 44 |
uninstall : |
| 45 |
-rm -f $(libdir)/font84.dat |
| 46 |
diff --git a/lib/src/Makefile.in b/lib/src/Makefile.in |
| 47 |
-index c23f488..3a611f1 100755 |
| 48 |
+index b32dd1e..cfa8852 100755 |
| 49 |
--- a/lib/src/Makefile.in |
| 50 |
+++ b/lib/src/Makefile.in |
| 51 |
@@ -685,7 +685,7 @@ testlib : $(srcdir)/testlib.f $(LF) |
| 52 |
@@ -102,18 +103,14 @@ |
| 53 |
@list='$(ccp4_HEADERS)'; for p in $$list; do \ |
| 54 |
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ |
| 55 |
f="`echo $$p | sed -e 's|^.*/||'`"; \ |
| 56 |
-@@ -716,13 +716,11 @@ uninstall-mmdbHEADERS: |
| 57 |
- rm -f $(DESTDIR)$(includedir)/mmdb/$$f; \ |
| 58 |
+@@ -717,10 +717,10 @@ uninstall-mmdbHEADERS: |
| 59 |
done |
| 60 |
|
| 61 |
--install : all install-ccp4HEADERS install-mmdbHEADERS |
| 62 |
-- $(INSTALL_DATA) `pwd`/$(LMMDB) $(libdir)/$(LMMDB) |
| 63 |
+ install : all install-ccp4HEADERS install-mmdbHEADERS |
| 64 |
- $(INSTALL_DATA) `pwd`/$(LC) $(libdir)/$(LC) |
| 65 |
- $(INSTALL_DATA) `pwd`/$(LF) $(libdir)/$(LF) |
| 66 |
-- $(RANLIB) $(libdir)/$(LMMDB) |
| 67 |
- $(RANLIB) $(libdir)/$(LC) |
| 68 |
- $(RANLIB) $(libdir)/$(LF) |
| 69 |
-+install : all install-ccp4HEADERS |
| 70 |
+ $(RANLIB) $(LC) |
| 71 |
+ $(RANLIB) $(LF) |
| 72 |
+ $(INSTALL_DATA) `pwd`/$(LC) $(DESTDIR)/$(libdir)/$(LC) |
Archives