Lines 1-5
Link Here
|
1 |
--- configure.orig 2009-08-01 03:19:34.000000000 -0400 |
1 |
--- configure.orig 2012-02-02 16:53:54.000000000 +0900 |
2 |
+++ configure 2010-01-08 22:01:38.000000000 -0500 |
2 |
+++ configure 2014-08-28 16:42:38.000000000 +0900 |
3 |
@@ -13,10 +13,10 @@ |
3 |
@@ -13,10 +13,10 @@ |
4 |
$install_name = "vmd"; |
4 |
$install_name = "vmd"; |
5 |
|
5 |
|
Lines 37-39
Link Here
|
37 |
|
37 |
|
38 |
NVCC = $arch_nvcc |
38 |
NVCC = $arch_nvcc |
39 |
NVCCFLAGS = $arch_nvccflags -DARCH_$config_arch \$(DEFINES) \$(INCDIRS) |
39 |
NVCCFLAGS = $arch_nvccflags -DARCH_$config_arch \$(DEFINES) \$(INCDIRS) |
|
|
40 |
@@ -2997,38 +2997,38 @@ |
41 |
\$(COMPILERC) \$(RCFLAGS) |
42 |
|
43 |
install: |
44 |
- if [ ! -d "$install_library_dir" ]; then \\ |
45 |
- \$(MAKEDIR) "$install_library_dir" ; \\ |
46 |
+ if [ ! -d "\${DESTDIR}$install_library_dir" ]; then \\ |
47 |
+ \$(MAKEDIR) "\${DESTDIR}$install_library_dir" ; \\ |
48 |
fi ; \\ |
49 |
- if [ ! -d "$install_bin_dir" ]; then \\ |
50 |
- \$(MAKEDIR) "$install_bin_dir" ; \\ |
51 |
+ if [ ! -d "\${DESTDIR}$install_bin_dir" ]; then \\ |
52 |
+ \$(MAKEDIR) "\${DESTDIR}$install_bin_dir" ; \\ |
53 |
fi ; \\ |
54 |
- if [ ! -d "$install_library_dir"/doc ]; then \\ |
55 |
- \$(MAKEDIR) "$install_library_dir"/doc; \\ |
56 |
+ if [ ! -d "\${DESTDIR}$install_library_dir"/doc ]; then \\ |
57 |
+ \$(MAKEDIR) "\${DESTDIR}$install_library_dir"/doc; \\ |
58 |
fi |
59 |
- -\$(COPY) ../Announcement "$install_library_dir" |
60 |
- -\$(COPY) ../README "$install_library_dir" |
61 |
- -\$(COPY) ../LICENSE "$install_library_dir" |
62 |
- -\$(COPY) $vmd_doc_dir/ug.pdf "$install_library_dir"/doc |
63 |
- if [ -f $install_library_dir/$config_progname ]; then \\ |
64 |
- \$(MOVE) "$install_library_dir/$config_progname" "$install_library_dir/OLD_$config_progname" ; \$(DELETE) "$install_library_dir/OLD_$config_progname" ; fi |
65 |
- -\$(COPY) ../$config_arch/$config_progname "$install_library_dir" |
66 |
+ -\$(COPY) ../Announcement "\${DESTDIR}$install_library_dir" |
67 |
+ -\$(COPY) ../README "\${DESTDIR}$install_library_dir" |
68 |
+ -\$(COPY) ../LICENSE "\${DESTDIR}$install_library_dir" |
69 |
+ -\$(COPY) $vmd_doc_dir/ug.pdf "\${DESTDIR}$install_library_dir"/doc |
70 |
+ if [ -f \${DESTDIR}$install_library_dir/$config_progname ]; then \\ |
71 |
+ \$(MOVE) "\${DESTDIR}$install_library_dir/$config_progname" "\${DESTDIR}$install_library_dir/OLD_$config_progname" ; \$(DELETE) "\${DESTDIR}$install_library_dir/OLD_$config_progname" ; fi |
72 |
+ -\$(COPY) ../$config_arch/$config_progname "\${DESTDIR}$install_library_dir" |
73 |
if [ -d "../lib/redistrib/lib_$config_arch" ]; then \\ |
74 |
\$(CD) ../lib/redistrib/lib_$config_arch; \$(TAR) -cf - ./* | \\ |
75 |
- (cd "$install_library_dir" ; \$(TAR) -xf -) \\ |
76 |
+ (cd "\${DESTDIR}$install_library_dir" ; \$(TAR) -xf -) \\ |
77 |
fi ; |
78 |
- -\$(COPY) @vmd_other_exe "$install_library_dir" |
79 |
+ -\$(COPY) @vmd_other_exe "\${DESTDIR}$install_library_dir" |
80 |
-\$(CD) ..; \$(TAR) -cf - scripts | \\ |
81 |
- (cd "$install_library_dir" ; \$(TAR) -xf -) |
82 |
+ (cd "\${DESTDIR}$install_library_dir" ; \$(TAR) -xf -) |
83 |
-\$(CD) $vmd_library_dir; \$(TAR) -cf - scripts | \\ |
84 |
- (cd "$install_library_dir" ; \$(TAR) -xf -) |
85 |
+ (cd "\${DESTDIR}$install_library_dir" ; \$(TAR) -xf -) |
86 |
-\$(CD) ..; \$(TAR) -cf - python | \\ |
87 |
- (cd "$install_library_dir"/scripts ; \$(TAR) -xf -) |
88 |
+ (cd "\${DESTDIR}$install_library_dir"/scripts ; \$(TAR) -xf -) |
89 |
-\$(CD) ..; \$(TAR) -cf - plugins | \\ |
90 |
- (cd "$install_library_dir" ; \$(TAR) -xf -) |
91 |
+ (cd "\${DESTDIR}$install_library_dir" ; \$(TAR) -xf -) |
92 |
-\$(CD) ..; \$(TAR) -cf - shaders | \\ |
93 |
- (cd "$install_library_dir" ; \$(TAR) -xf -) |
94 |
- -\$(COPY) ../data/.vmdrc ../data/.vmdsensors ../data/vmd_completion.dat "$install_library_dir" |
95 |
+ (cd "\${DESTDIR}$install_library_dir" ; \$(TAR) -xf -) |
96 |
+ -\$(COPY) ../data/.vmdrc ../data/.vmdsensors ../data/vmd_completion.dat "\${DESTDIR}$install_library_dir" |
97 |
\$(CD) $vmd_bin_dir ; \\ |
98 |
if [ -f run_vmd_tmp ]; then \$(DELETE) run_vmd_tmp; fi ; \\ |
99 |
if [ ! -x "/bin/csh" ]; then \\ |
100 |
@@ -3044,7 +3044,7 @@ |
101 |
cat $vmd_bin_csh >> run_vmd_tmp ; \\ |
102 |
fi ; \\ |
103 |
chmod +x run_vmd_tmp ; \\ |
104 |
- \$(COPY) run_vmd_tmp "$install_bin_dir"/$install_name ; \\ |
105 |
+ \$(COPY) run_vmd_tmp "\${DESTDIR}$install_bin_dir"/$install_name ; \\ |
106 |
\$(DELETE) run_vmd_tmp |
107 |
\$(ECHO) Make sure "$install_bin_dir"/$install_name is in your path. |
108 |
\$(ECHO) "VMD installation complete. Enjoy!" |