blob: 33ca9e23ce8fcb8a10249a68c2b2d55e746f9b86 (
plain) (
blame)
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
|
--- configure.orig 2016-12-01 07:11:33 UTC
+++ configure
@@ -13,10 +13,10 @@
$install_name = "vmd";
# Directory where VMD startup script is installed, should be in users' paths.
-$install_bin_dir="/usr/local/bin";
+$install_bin_dir="\${DESTDIR}\${PREFIX}/bin";
# Directory where VMD files and executables are installed
-$install_library_dir="/usr/local/lib/$install_name";
+$install_library_dir="\${DESTDIR}\${PREFIX}/lib/$install_name";
# optionally override hard-coded defaults above with environment variables
@@ -729,8 +729,8 @@ $tcl_include = "-I$stock_tcl_includ
if ($config_tk) { $tcl_include .= " -I$stock_tk_include_dir"; }
$tcl_library = "-L$stock_tcl_library_dir";
if ($config_tk) { $tcl_library .= " -L$stock_tk_library_dir"; }
-$tcl_libs = "-ltcl8.5";
-if ($config_tk) { $tcl_libs = "-ltk8.5 -lX11 " . $tcl_libs; }
+$tcl_libs = "\${TCLLDFLAGS}";
+if ($config_tk) { $tcl_libs = "\${TKLDFLAGS} " . $tcl_libs; }
@tcl_cc = ();
@tcl_cu = ();
@@ -1105,8 +1105,8 @@ if ($config_liboptix) {
# This may be commented out if not required.
$libtachyon_defines = "-DVMDLIBTACHYON";
$libtachyon_dir = "$vmd_library_dir/tachyon";
-$libtachyon_include = "-I$libtachyon_dir/include";
-$libtachyon_library = "-L$libtachyon_dir/lib_$config_arch";
+$libtachyon_include = "-I$libtachyon_dir/src";
+$libtachyon_library = "-L$libtachyon_dir/compile/bsd";
$libtachyon_libs = "-ltachyon";
@libtachyon_cc = ();
@libtachyon_cu = ();
@@ -3187,10 +3187,10 @@ DEFINES = $DEFINES
# compiler and compiler directives
CC = $arch_cc
-CFLAGS = $arch_copts -DARCH_$config_arch \$(DEFINES) \$(INCDIRS) $rpm_optflags
+CFLAGS = $arch_copts -DARCH_$config_arch \$(DEFINES) \$(INCDIRS)
CCPP = $arch_ccpp
-CPPFLAGS = $arch_opt_flag $arch_cppopts -DARCH_$config_arch \$(DEFINES) \$(INCDIRS) $rpm_optflags
+CPPFLAGS = \${CXXFLAGS} $arch_opt_flag $arch_cppopts -DARCH_$config_arch \$(DEFINES) \$(INCDIRS)
NVCC = $arch_nvcc
NVCCFLAGS = $arch_nvccflags -DARCH_$config_arch \$(DEFINES) \$(INCDIRS)
|
