blob: 316e0446e83b50bf3ed07061353d933c82243539 (
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
|
--- src/Makefile.am_orig 2016-11-09 16:13:53.942706012 -0500
+++ src/Makefile.am 2016-11-09 16:15:08.263956290 -0500
@@ -457,7 +457,9 @@
EXTRA_DIST += coot_wrap_python_pre.cc
endif
if COOT_USE_PYTHON
- dist_python_PYTHON = coot.py coot.pth
+ # dist_python_PYTHON = coot.py coot.pth
+ pythondir = $(pkgdatadir)/python
+ dist_pkgpython_SCRIPTS = coot.py
endif
--- lbg/Makefile.am_orig 2016-11-09 16:46:09.161705178 -0500
+++ lbg/Makefile.am 2016-11-09 21:51:45.630944576 -0500
@@ -73,8 +73,8 @@
# I don't understand. Maybe the setting of wl should be done in configure? But then
# I have to force the output of libtool. Bleugh. Hmm...
# Anyway, thankyou Gary Vaughan.
-wl=-Wl,
-lidia_LDFLAGS = $(EXPORT_DYNAMIC_FLAG_SPEC)
+# wl=-Wl,
+# lidia_LDFLAGS = $(EXPORT_DYNAMIC_FLAG_SPEC)
# res spec output operator means we include libcoot-coord-utils
# (if that is annoying, then remove it and expand it by hand)
@@ -106,7 +106,7 @@
test_srs_standalone_SOURCES = test-srs-standalone.cc
test_srs_standalone_LDADD = $(CCP4SRS_LIBS) $(MMDB_LIBS)
-pkgpythondir=$(pythondir)/lidia
+pkgpythondir=$(pythondir)/coot/lidia
dist_pkgpython_PYTHON = \
__init__.py fetch.py
|