The following patch uses automake's integrated python support to
install configure.py and the other scripts. This means in particular
that the pyc and pyo files get installed. 

Does this look sound? (we do that for lyx2lyx, BTW). 

The code also sets the executable bit on the python scripts. Does it
make sense?

Should lyx2lyx also have this bit set?

JMarc

Index: lib/lyx2lyx/Makefile.am
===================================================================
--- lib/lyx2lyx/Makefile.am	(revision 14576)
+++ lib/lyx2lyx/Makefile.am	(working copy)
@@ -3,9 +3,7 @@
 CLEANFILES += *.pyc *.pyo
 
 lyx2lyxdir = $(pkgdatadir)/lyx2lyx
-# We cannot use dist_lyx2lyx_SCRIPTS for lyx2lyx, since a possible
-# version-suffix would get appended to the names. So we use dist_scripts_DATA
-# and chmod manually in install-data-hook.
+
 dist_lyx2lyx_PYTHON = \
 	lyx2lyx \
 	parser_tools.py \
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am	(revision 14576)
+++ lib/Makefile.am	(working copy)
@@ -2,17 +2,17 @@
 
 SUBDIRS = doc lyx2lyx
 
-EXTRA_DIST = \
-	chkconfig.ltx
-
 CHMOD = chmod
 
 # We cannot use dist_pkgdata_SCRIPTS for configure, since a possible
 # version-suffix would get appended to the names. So we use dist_pkgdata_DATA
 # and chmod manually in install-data-hook.
-dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx configure.py \
+dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx \
 	       external_templates encodings languages symbols syntax.default
 
+# Note that we "chmod 755" manually this file in install-data-hook.
+dist_pkgdata_PYTHON = configure.py 
+
 binddir = $(pkgdatadir)/bind
 dist_bind_DATA = \
 	bind/broadway.bind \
@@ -841,10 +841,8 @@
 	layouts/svglobal.layout
 
 scriptsdir = $(pkgdatadir)/scripts
-# We cannot use dist_scripts_SCRIPTS, since a possible version-suffix would
-# get appended to the names. So we use dist_scripts_DATA and chmod manually
-# in install-data-hook.
-dist_scripts_DATA = \
+# Note that we "chmod 755" manually these files in install-data-hook.
+dist_scripts_PYTHON = \
 	scripts/TeXFiles.py \
 	scripts/clean_dvi.py \
 	scripts/convertDefault.py \
@@ -901,6 +899,6 @@
 
 install-data-hook:
 	$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py
-	for i in $(dist_scripts_DATA); do \
+	for i in $(dist_scripts_PYTHON); do \
 		$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/$$i; \
 	done

Reply via email to