| 1 |
jlec 12/08/26 16:03:01 |
| 2 |
|
| 3 |
Added: meme-4.8.1-Makefile.am.patch |
| 4 |
Log: |
| 5 |
sci-biology/meme: Version Bump; respect CFLAGS, #430774 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sci-biology/meme/files/meme-4.8.1-Makefile.am.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/meme/files/meme-4.8.1-Makefile.am.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-biology/meme/files/meme-4.8.1-Makefile.am.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: meme-4.8.1-Makefile.am.patch |
| 16 |
=================================================================== |
| 17 |
Makefile.am | 6 +++--- |
| 18 |
doc/Makefile.am | 2 +- |
| 19 |
doc/examples/Makefile.am | 24 +++++++++++----------- |
| 20 |
.../Makefile.am | 2 +- |
| 21 |
doc/examples/sample_opal_scripts/Makefile.am | 2 +- |
| 22 |
doc/images/Makefile.am | 2 +- |
| 23 |
scripts/Makefile.am | 2 +- |
| 24 |
7 files changed, 20 insertions(+), 20 deletions(-) |
| 25 |
|
| 26 |
diff --git a/Makefile.am b/Makefile.am |
| 27 |
index 4a69e34..842e33f 100644 |
| 28 |
--- a/Makefile.am |
| 29 |
+++ b/Makefile.am |
| 30 |
@@ -18,11 +18,11 @@ ARCHIVE_REVISION: |
| 31 |
install-data-hook: dbdir |
| 32 |
|
| 33 |
dbdir: |
| 34 |
- mkdir -p $(MEME_DB) |
| 35 |
+ mkdir -p $(DESTDIR)$(MEME_DB) |
| 36 |
|
| 37 |
install-data-local: |
| 38 |
- mkdir -p $(MEME_LOGS) |
| 39 |
- chmod a+w $(MEME_LOGS) |
| 40 |
+ mkdir -p $(DESTDIR)$(MEME_LOGS) |
| 41 |
+ chmod a+w $(DESTDIR)$(MEME_LOGS) |
| 42 |
|
| 43 |
distdir = $(PACKAGE)_$(VERSION) |
| 44 |
|
| 45 |
diff --git a/doc/Makefile.am b/doc/Makefile.am |
| 46 |
index e0d6af9..e7bcb4f 100644 |
| 47 |
--- a/doc/Makefile.am |
| 48 |
+++ b/doc/Makefile.am |
| 49 |
@@ -202,7 +202,7 @@ COMMON_DOC = \ |
| 50 |
if WEBSITE |
| 51 |
MEME_DOC_DIR = $(WEBDIR)/doc |
| 52 |
else |
| 53 |
-MEME_DOC_DIR = $(prefix)/doc |
| 54 |
+MEME_DOC_DIR = $(docdir)/html |
| 55 |
endif |
| 56 |
|
| 57 |
memedocdir = $(MEME_DOC_DIR) |
| 58 |
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am |
| 59 |
index 12970b5..633492c 100644 |
| 60 |
--- a/doc/examples/Makefile.am |
| 61 |
+++ b/doc/examples/Makefile.am |
| 62 |
@@ -51,24 +51,24 @@ if WEBSITE |
| 63 |
exdir = $(WEBDIR)/examples |
| 64 |
other_exdir = $(WEBDIR)/doc/examples |
| 65 |
else |
| 66 |
-exdir = $(prefix)/doc/examples |
| 67 |
+exdir = $(prefix)/share/meme/examples |
| 68 |
other_exdir = $(exdir) |
| 69 |
endif |
| 70 |
|
| 71 |
ex_DATA = $(EXAMPLES) |
| 72 |
|
| 73 |
install-data-hook: |
| 74 |
- tar xzvf centrimo_example_output_files.tgz -C $(other_exdir) |
| 75 |
- tar xzvf dreme_example_output_files.tgz -C $(other_exdir) |
| 76 |
- tar xzvf fimo_example_output_files.tgz -C $(other_exdir) |
| 77 |
- tar xzvf glam2_example_output_files.tgz -C $(other_exdir) |
| 78 |
- tar xzvf glam2scan_example_output_files.tgz -C $(other_exdir) |
| 79 |
- tar xzvf mast_example_output_files.tgz -C $(other_exdir) |
| 80 |
- tar xzvf mcast_example_output_files.tgz -C $(other_exdir) |
| 81 |
- tar xzvf meme_example_output_files.tgz -C $(other_exdir) |
| 82 |
- tar xzvf memechip_example_output_files.tgz -C $(other_exdir) |
| 83 |
- tar xzvf spamo_example_output_files.tgz -C $(other_exdir) |
| 84 |
- tar xzvf tomtom_example_output_files.tgz -C $(other_exdir) |
| 85 |
+ tar xzvf centrimo_example_output_files.tgz -C $(DESTDIR)/$(other_exdir) |
| 86 |
+ tar xzvf dreme_example_output_files.tgz -C $(DESTDIR)/$(other_exdir) |
| 87 |
+ tar xzvf fimo_example_output_files.tgz -C $(DESTDIR)/$(other_exdir) |
| 88 |
+ tar xzvf glam2_example_output_files.tgz -C $(DESTDIR)/$(other_exdir) |
| 89 |
+ tar xzvf glam2scan_example_output_files.tgz -C $(DESTDIR)/$(other_exdir) |
| 90 |
+ tar xzvf mast_example_output_files.tgz -C $(DESTDIR)/$(other_exdir) |
| 91 |
+ tar xzvf mcast_example_output_files.tgz -C $(DESTDIR)/$(other_exdir) |
| 92 |
+ tar xzvf meme_example_output_files.tgz -C $(DESTDIR)/$(other_exdir) |
| 93 |
+ tar xzvf memechip_example_output_files.tgz -C $(DESTDIR)/$(other_exdir) |
| 94 |
+ tar xzvf spamo_example_output_files.tgz -C $(DESTDIR)/$(other_exdir) |
| 95 |
+ tar xzvf tomtom_example_output_files.tgz -C $(DESTDIR)/$(other_exdir) |
| 96 |
|
| 97 |
# If .svnignore file doesn't exist |
| 98 |
# create an empty one |
| 99 |
diff --git a/doc/examples/compute_prior_dist_example_output_files/Makefile.am b/doc/examples/compute_prior_dist_example_output_files/Makefile.am |
| 100 |
index 747028d..a358f58 100644 |
| 101 |
--- a/doc/examples/compute_prior_dist_example_output_files/Makefile.am |
| 102 |
+++ b/doc/examples/compute_prior_dist_example_output_files/Makefile.am |
| 103 |
@@ -22,7 +22,7 @@ EXAMPLES = \ |
| 104 |
if WEBSITE |
| 105 |
exdir = $(WEBDIR)/doc/examples/compute_prior_dist_example_output_files |
| 106 |
else |
| 107 |
-exdir = $(prefix)/doc/examples/compute_prior_dist_example_output_files |
| 108 |
+exdir = $(prefix)/share/meme/examples/compute_prior_dist_example_output_files |
| 109 |
endif |
| 110 |
|
| 111 |
ex_DATA = $(EXAMPLES) |
| 112 |
diff --git a/doc/examples/sample_opal_scripts/Makefile.am b/doc/examples/sample_opal_scripts/Makefile.am |
| 113 |
index 3a638b3..30925bb 100644 |
| 114 |
--- a/doc/examples/sample_opal_scripts/Makefile.am |
| 115 |
+++ b/doc/examples/sample_opal_scripts/Makefile.am |
| 116 |
@@ -18,7 +18,7 @@ EXAMPLES = \ |
| 117 |
if WEBSITE |
| 118 |
exdir = $(WEBDIR)/doc/examples/sample_opal_scripts |
| 119 |
else |
| 120 |
-exdir = $(prefix)/doc/examples/sample_opal_scripts |
| 121 |
+exdir = $(prefix)/share/meme/examples/sample_opal_scripts |
| 122 |
endif |
| 123 |
|
| 124 |
ex_DATA = $(EXAMPLES) |
| 125 |
diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am |
| 126 |
index c879621..a4696cd 100644 |
| 127 |
--- a/doc/images/Makefile.am |
| 128 |
+++ b/doc/images/Makefile.am |
| 129 |
@@ -28,7 +28,7 @@ MEME_IMAGES = \ |
| 130 |
if WEBSITE |
| 131 |
memeimgdir = $(WEBDIR)/doc/images |
| 132 |
else |
| 133 |
-memeimgdir = $(prefix)/doc/images |
| 134 |
+memeimgdir = $(docdir)/html/images |
| 135 |
endif |
| 136 |
|
| 137 |
memeimg_DATA = $(MEME_IMAGES) |
| 138 |
diff --git a/scripts/Makefile.am b/scripts/Makefile.am |
| 139 |
index 4143e46..8a5c021 100644 |
| 140 |
--- a/scripts/Makefile.am |
| 141 |
+++ b/scripts/Makefile.am |
| 142 |
@@ -8,7 +8,7 @@ |
| 143 |
if WEBSITE |
| 144 |
MEME_DOC_DIR = $(WEBDIR)/doc |
| 145 |
else |
| 146 |
-MEME_DOC_DIR = $(prefix)/doc |
| 147 |
+MEME_DOC_DIR = $(docdir) |
| 148 |
endif |
| 149 |
|
| 150 |
ARCHIVE_REVISION = $(shell cat ../ARCHIVE_REVISION) |
Archives