43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
--- src/Makefile.am_orig 2015-06-29 23:10:49.500572880 -0400
|
|
+++ src/Makefile.am 2015-06-29 23:11:33.041822617 -0400
|
|
@@ -27,9 +27,8 @@
|
|
#__init__.py: coot.py
|
|
# cp coot.py __init__.py
|
|
|
|
-
|
|
-dist_python_SCRIPTS = coot.py coot.pth
|
|
-
|
|
+pythondir = $(pkgdatadir)/python
|
|
+dist_pkgpython_SCRIPTS = coot.py
|
|
|
|
endif
|
|
|
|
--- pixmaps/icons/Makefile.am_orig 2015-06-29 23:11:55.713911249 -0400
|
|
+++ pixmaps/icons/Makefile.am 2015-06-29 23:26:22.902239461 -0400
|
|
@@ -11,6 +11,6 @@
|
|
CONTEXT=` echo $$icon | cut -d_ -f2`; \
|
|
SIZE=` echo $$icon | cut -d_ -f3`; \
|
|
ICONFILE=`echo $$icon | cut -d_ -f4`; \
|
|
- mkdir -p $(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
|
|
- $(INSTALL_DATA) $(srcdir)/$$icon $(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
|
|
+ mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
|
|
+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
|
|
done;
|
|
--- lbg/Makefile.am_orig 2015-09-24 23:04:49.843200580 -0400
|
|
+++ lbg/Makefile.am 2015-09-24 23:10:03.355713678 -0400
|
|
@@ -1,4 +1,3 @@
|
|
-
|
|
lib_LTLIBRARIES=libcoot-lidia.la
|
|
|
|
AM_CPPFLAGS = \
|
|
@@ -53,8 +52,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)
|