From: Enrico Forestieri <forenr@lyx.org>
Date: Thu, 17 Jun 2010 10:32:11 +0000 (+0000)
Subject: On cygwin, install by default lyxprofile and lyxrc.dist, otherwise
X-Git-Tag: 2.0.0~3111
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e85790c3a37a63f23775b963a3244742a994c139;p=features.git

On cygwin, install by default lyxprofile and lyxrc.dist, otherwise
packagers may forget to do it in post-install scripts.


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

diff --git a/development/cygwin/Makefile.am b/development/cygwin/Makefile.am
index 16c093579b..6e5684f944 100644
--- a/development/cygwin/Makefile.am
+++ b/development/cygwin/Makefile.am
@@ -9,7 +9,9 @@ include $(top_srcdir)/config/common.am
 
 bin_PROGRAMS = lyxeditor lyxwin
 bin_SCRIPTS = lyxeditor.sh
-dist_noinst_DATA = lyxprofile
+
+lyxdistdir = $(pkgdatadir)
+dist_lyxdist_DATA = lyxprofile lyxrc.dist
 
 lyxeditor_SOURCES = lyxeditor.c
 lyxwin_SOURCES = lyxwin.c lyxwinres.rc
diff --git a/development/cygwin/lyxwin.c b/development/cygwin/lyxwin.c
index bae25279ab..d1ac5bf0fe 100644
--- a/development/cygwin/lyxwin.c
+++ b/development/cygwin/lyxwin.c
@@ -74,7 +74,7 @@ int main (int argc, char **argv, char **environ)
 
 	/* fprintf(stderr , "Command is: |%s|\n", cmd); */
 	/* ensure bash reads our global env changes */
-	putenv("BASH_ENV=/etc/lyxprofile") ;
+	putenv("BASH_ENV=" LYX_ABS_INSTALLED_DATADIR "/lyxprofile") ;
 	/* exec sub command */
 	spawnv(_P_NOWAIT, "/bin/bash", nargs);
 	/* exit with no error */