* lib/Makefile.am (dist_pkgdata_DATA): remove configure.py

	(dist_pkgdata_PYTHON): and put it here
	(dist_scripts_DATA): rename to dist_scripts_PYTHON; this invokes
	automake's built-in python support.
	(install-data-hook): adapt to above change.

	* lib/lyx2lyx/Makefile.am (dist_lyx2lyx_DATA): rename to dist_lyx2lyx_PYTHON;
	this invokes automake's built-in python support.
	(install-data-hook): new target: sets executable bit on lyx2lyx.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14592 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 14c65493fdab003323818a5e0c4caca06632af5a..53c42639d91368c9ac1ddf3431c50cb023cc762f 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,17 +2,14 @@ include $(top_srcdir)/config/common.am
 
 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 
+
 dist_noinst_DATA = \
        images/README \
        images/font-smallcaps.xpm \
@@ -874,10 +871,8 @@ dist_layouts_DATA =\
        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 \
@@ -934,6 +929,6 @@ dist_ui_DATA = \
 
 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

diff --git a/lib/lyx2lyx/Makefile.am b/lib/lyx2lyx/Makefile.am
index cd9e3856e427197f01450ac931a24357d65656e6..88b82bc5e7a17daa75232b2eb60aa7de82f0e8d8 100644 (file)
--- a/lib/lyx2lyx/Makefile.am
+++ b/lib/lyx2lyx/Makefile.am
@@ -4,10 +4,9 @@ CLEANFILES += *.pyc *.pyo
 
 EXTRA_DIST = lyx2lyx_version.py.in
 
+CHMOD = chmod
+
 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 \
        lyx2lyx_version.py \
@@ -30,3 +29,6 @@ dist_lyx2lyx_PYTHON = \
        lyx_1_5.py \
        profiling.py \
        test_parser_tools.py
+
+install-data-hook:
+       $(CHMOD) 755 $(DESTDIR)$(lyx2lyxdir)/lyx2lyx