summaryrefslogtreecommitdiff
blob: b9ff5b92b8f94cf8870fccae6dc0f91f4b899f90 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
Install headers into 'hmmer3' subdir and not into global includedir.

--- a/easel/Makefile.in
+++ b/easel/Makefile.in
@@ -465,11 +465,12 @@
 	${INSTALL} -d ${DESTDIR}${bindir}
 	${INSTALL} -d ${DESTDIR}${libdir}
 	${INSTALL} -d ${DESTDIR}${includedir}
+	${INSTALL} -d ${DESTDIR}${includedir}/hmmer3
 	${INSTALL} -m 0644 libeasel.a ${DESTDIR}${libdir}/
 	for file in ${HDRS}; do\
-	   ${INSTALL} -m 0644 ${srcdir}/$$file ${DESTDIR}${includedir}/ ;\
+	   ${INSTALL} -m 0644 ${srcdir}/$$file ${DESTDIR}${includedir}/hmmer3/ ;\
 	done
-	${INSTALL} -m 0644 esl_config.h ${DESTDIR}${includedir}/
+	${INSTALL} -m 0644 esl_config.h ${DESTDIR}${includedir}/hmmer3/
 	${QUIET_SUBDIR0}miniapps      ${QUIET_SUBDIR1} install
 
 # "make uninstall" reverses the steps of "make install"
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,6 +143,7 @@
 	${INSTALL} -d ${DESTDIR}${bindir}
 	${INSTALL} -d ${DESTDIR}${libdir}
 	${INSTALL} -d ${DESTDIR}${includedir}
+	${INSTALL} -d ${DESTDIR}${includedir}/hmmer3
 	${INSTALL} -d ${DESTDIR}${man1dir}
 	${INSTALL} -d ${DESTDIR}${pdfdir}
 	${QUIET_SUBDIR0}src           ${QUIET_SUBDIR1} install
--- a/src/impl_dummy/Makefile.in
+++ b/src/impl_dummy/Makefile.in
@@ -152,8 +152,9 @@
 	${CC} ${CFLAGS} ${SIMDFLAGS} ${CPPFLAGS} ${LDFLAGS} ${DEFS} ${MYLIBDIRS} ${MYINCDIRS} -D$${DFLAG} -o $@ $${DFILE} ${LIBS}
 
 install:
+	${INSTALL} -d ${DESTDIR}${includedir}/hmmer3
 	for file in ${HDRS}; do \
-	   ${INSTALL} -m 0644 ${srcdir}/$$file ${DESTDIR}${includedir}/ ;\
+	   ${INSTALL} -m 0644 ${srcdir}/$$file ${DESTDIR}${includedir}/hmmer3/ ;\
 	done
 
 uninstall:
--- a/src/impl_sse/Makefile.in
+++ b/src/impl_sse/Makefile.in
@@ -155,8 +155,9 @@
 
 
 install:
+	${INSTALL} -d ${DESTDIR}${includedir}/hmmer3
 	for file in ${HDRS}; do \
-	   ${INSTALL} -m 0644 ${srcdir}/$$file ${DESTDIR}${includedir}/ ;\
+	   ${INSTALL} -m 0644 ${srcdir}/$$file ${DESTDIR}${includedir}/hmmer3/ ;\
 	done
 
 uninstall:
--- a/src/impl_vmx/Makefile.in
+++ b/src/impl_vmx/Makefile.in
@@ -152,8 +152,9 @@
 	${CC} ${CFLAGS} ${SIMDFLAGS} ${CPPFLAGS} ${LDFLAGS} ${DEFS} ${MYLIBDIRS} ${MYINCDIRS} -D$${DFLAG} -o $@ $${DFILE} ${LIBS}
 
 install:
+	${INSTALL} -d ${DESTDIR}${includedir}/hmmer3
 	for file in ${HDRS}; do \
-	   ${INSTALL} -m 0644 ${srcdir}/$$file ${DESTDIR}${includedir}/ ;\
+	   ${INSTALL} -m 0644 ${srcdir}/$$file ${DESTDIR}${includedir}/hmmer3/ ;\
 	done
 
 uninstall:
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -322,15 +322,16 @@
 	${CC} ${CFLAGS} ${SIMDFLAGS} ${CPPFLAGS} ${LDFLAGS} ${DEFS} ${MYLIBDIRS} ${MYINCDIRS} -D$${DFLAG} -o $@ $${DFILE} ${LIBS}
 
 install:
+	${INSTALL} -d ${DESTDIR}${includedir}/hmmer3
 	${QUIET_SUBDIR0}${IMPLDIR} ${QUIET_SUBDIR1} install
 	for file in ${PROGS}; do \
 	   ${INSTALL} -m 0755 $$file ${DESTDIR}${bindir}/ ;\
 	done
 	${INSTALL} -m 0755 libhmmer.a ${DESTDIR}${libdir}/
 	for file in ${HDRS}; do \
-	   ${INSTALL} -m 0644 ${srcdir}/$$file ${DESTDIR}${includedir}/ ;\
+	   ${INSTALL} -m 0644 ${srcdir}/$$file ${DESTDIR}${includedir}/hmmer3/ ;\
 	done
-	${INSTALL} -m 0644 p7_config.h ${DESTDIR}${includedir}/ ;\
+	${INSTALL} -m 0644 p7_config.h ${DESTDIR}${includedir}/hmmer3/ ;\
 
 uninstall:
 	${QUIET_SUBDIR0}${IMPLDIR} ${QUIET_SUBDIR1} uninstall