Author: lasgouttes
Date: Wed Jan 25 23:59:42 2012
New Revision: 40675
URL: http://www.lyx.org/trac/changeset/40675
Log:
Fix installation of python files:
- be compatible with automake 1.11.2 (#7990)
- do not install pyo/pyc files in share directory (#6080)
This is a backport of r40635, r40669 and r40670.
Deleted:
lyx-devel/branches/BRANCH_2_0_X/config/config.guess
lyx-devel/branches/BRANCH_2_0_X/config/config.sub
lyx-devel/branches/BRANCH_2_0_X/config/depcomp
lyx-devel/branches/BRANCH_2_0_X/config/install-sh
lyx-devel/branches/BRANCH_2_0_X/config/missing
lyx-devel/branches/BRANCH_2_0_X/config/py-compile
Modified:
lyx-devel/branches/BRANCH_2_0_X/autogen.sh
lyx-devel/branches/BRANCH_2_0_X/config/ (props changed)
lyx-devel/branches/BRANCH_2_0_X/lib/Makefile.am
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/autogen.sh
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/autogen.sh Wed Jan 25 23:26:31 2012
(r40674)
+++ lyx-devel/branches/BRANCH_2_0_X/autogen.sh Wed Jan 25 23:59:42 2012
(r40675)
@@ -2,7 +2,7 @@
ACLOCAL="aclocal -I m4 -I config"
AUTOHEADER="autoheader"
-AUTOMAKE="automake --add-missing --copy --foreign"
+AUTOMAKE="automake --add-missing --force-missing --copy --foreign"
AUTOCONF="autoconf"
# Discover what version of automake we are using.
Modified: lyx-devel/branches/BRANCH_2_0_X/lib/Makefile.am
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/lib/Makefile.am Wed Jan 25 23:26:31
2012 (r40674)
+++ lyx-devel/branches/BRANCH_2_0_X/lib/Makefile.am Wed Jan 25 23:59:42
2012 (r40675)
@@ -8,8 +8,9 @@
encodings layouttranslations languages symbols syntax.default \
unicodesymbols
+# We use DATA now instead of PYTHON because automake 1.11.2 complains.
# Note that we "chmod 755" manually this file in install-data-hook.
-dist_pkgdata_PYTHON = configure.py
+dist_pkgdata_DATA += configure.py
dist_noinst_DATA = \
images/README \
@@ -1499,8 +1500,9 @@
scripts/bash_completion \
scripts/lyxstangle.R \
scripts/lyxsweave.R
+# We use DATA now instead of PYTHON because automake 1.11.2 complains.
# Note that we "chmod 755" manually these files in install-data-hook.
-dist_scripts_PYTHON = \
+dist_scripts_DATA += \
scripts/clean_dvi.py \
scripts/convertDefault.py \
scripts/csv2lyx.py \
@@ -1624,6 +1626,6 @@
install-data-hook:
$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py
- for i in $(dist_scripts_PYTHON); do \
+ for i in $(scriptdir)/*.py ; do \
$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/$$i; \
done
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Wed Jan 25 23:26:31 2012
(r40674)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Wed Jan 25 23:59:42 2012
(r40675)
@@ -232,3 +232,6 @@
- Fix link problem when compiling on Mac OS X with plain autotools.
- Add forgotten file Package.cpp to list of files that need l10n.
+
+- Fix installation of python files (bug 6080, bug 7990).
+
