Lars Gullik Bjønnes wrote:
> Georg Baum <[EMAIL PROTECTED]>
> writes:
> | No, I did not notice that until now, but I will do it. BTW, what should
> | we do with configure.cmd? It is really outdated. Should we install it at
> | all? Probably only for OS/2, but I don't know how to do that.
>
> Ignore it I guess. Unless a OS/2 person pops up.
Here comes the updated patch that will go in now. I made a comment about
configure.cmd and did not install it.
Georg
Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.648
diff -u -p -r1.648 ChangeLog
--- lib/ChangeLog 1 Nov 2004 08:50:41 -0000 1.648
+++ lib/ChangeLog 4 Nov 2004 16:35:21 -0000
@@ -1,3 +1,8 @@
+2004-11-04 Georg Baum <[EMAIL PROTECTED]>
+
+ * Makefile.am: fix installation of lyx2lyx and scripts for
+ configure --version-suffix
+
2004-11-01 Georg Baum <[EMAIL PROTECTED]>
* configure.m4: add copier for pstex_t and pdftex_t files
Index: lib/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/Makefile.am,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile.am
--- lib/Makefile.am 1 Nov 2004 08:50:41 -0000 1.66
+++ lib/Makefile.am 4 Nov 2004 16:35:21 -0000
@@ -10,12 +10,14 @@ EXTRA_DIST = \
CHMOD = chmod
-dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx lyxrc.defaults \
- textclass.lst packages.lst external_templates \
+# 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.
+# configure.cmd (used on OS/2) is not installed because it is outdated.
+dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx configure \
+ lyxrc.defaults textclass.lst packages.lst external_templates \
encodings languages symbols
-dist_pkgdata_SCRIPTS = configure configure.cmd
-
binddir = $(pkgdatadir)/bind
dist_bind_DATA = \
bind/broadway.bind \
@@ -835,7 +838,9 @@ dist_layouts_DATA =\
layouts/svglobal.layout
lyx2lyxdir = $(pkgdatadir)/lyx2lyx
-dist_lyx2lyx_SCRIPTS = lyx2lyx/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_DATA = \
lyx2lyx/lyx2lyx \
lyx2lyx/parser_tools.py \
@@ -853,7 +858,10 @@ dist_lyx2lyx_DATA = \
lyx2lyx/profiling.py
scriptsdir = $(pkgdatadir)/scripts
-dist_scripts_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 = \
scripts/TeXFiles.sh \
scripts/convertDefault.sh \
scripts/fen2ascii.py \
@@ -933,3 +942,10 @@ install-data-local: install-xfonts
uninstall-local: uninstall-xfonts
+
+install-data-hook:
+ $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/lyx2lyx/lyx2lyx
+ $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure
+ for i in $(dist_scripts_DATA); do \
+ $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/$$i; \
+ done
