From 25dc517532433b6a6af8a03663bd4ade86e24ace Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Thu, 17 Jun 2010 10:42:32 +0000
Subject: [PATCH] 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/branches/BRANCH_1_6_X@34683 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/cygwin/Makefile.am | 4 +++-
 development/cygwin/lyxwin.c    | 2 +-
 status.16x                     | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

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 */
diff --git a/status.16x b/status.16x
index e855f45cd5..79c7d93a01 100644
--- a/status.16x
+++ b/status.16x
@@ -63,6 +63,8 @@ What's new
 
 * BUILD/INSTALLATION
 
+- On cygwin, install by default lyxprofile and lyxrc.dist in order to
+  avoid to do it in post-install scripts.
 
 
 ** Bug fixes: