anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 09:15:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Portable hard-coded paths on Windows.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@10497 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Angus Leeming 2005-09-29 13:26:46 +00:00
parent 9c68fb1895
commit a0642f6ae0
5 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/ChangeLog
View File

@ -1,3 +1,16 @@
2005-09-29 Angus Leeming <leeming@lyx.org>
* lyxinclude213.m4:
* lyxinclude25x.m4: add a new MSYS_AC_CANONICAL_PATH macro that
generates a Windows native path on Windows boxes and unix native
path on *nix boxes. With thanks to Keith Marshall. Details can
be found here: http://thread.gmane.org/gmane.comp.gnu.mingw.msys/2937
* configure.in:
* configure.ac: Use the new MSYS_AC_CANONICAL_PATH to generate
path strings that make sense on Windows as well as on Unix boxes.
Insert these strings into the generated Makefiles.
2005-07-17 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* qt.m4 (QT_DO_IT_ALL): define QT_NO_STL.

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-29 Angus Leeming <leeming@lyx.org>
* Makefile.am: use the Windows-friendly LYX_ABS_INSTALLED_LOCALEDIR
rather than the unix-centric $(localedir) when compiling main.C.
2005-09-26 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* BufferView_pimpl.C (selectionRequested): don't stuff redundant

2
src/Makefile.am
View File

@ -225,7 +225,7 @@ lyx_SOURCES = \
main.$(OBJEXT): main.C config.h lyx_main.h gettext.h LString.h \
support/filetools.h support/os.h
$(CXXCOMPILE) -DLOCALEDIR=\"$(localedir)\" -c $(top_srcdir)/src/main.C
$(CXXCOMPILE) -DLOCALEDIR=\"$(LYX_ABS_INSTALLED_LOCALEDIR)\" -c $(top_srcdir)/src/main.C
dist-hook:
cd $(distdir) ; rm -rf `find cheaders -name \*CVS\*`

6
src/support/ChangeLog
View File

@ -1,3 +1,9 @@
2005-09-29 Angus Leeming <leeming@lyx.org>
* Makefile.am: use the Windows-friendly LYX_ABS_INSTALLED_LOCALEDIR
et al rather than the unix-centric $(localedir) when compiling
package.C.
2005-09-20 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* Makefile.am (EXTRA_DIST): add os_cygwin.C

8
src/support/Makefile.am
View File

@ -75,10 +75,8 @@ package.lo: ../config.h \
$(top_srcdir)/src/gettext.h $(top_srcdir)/src/Lsstream.h \
$(top_srcdir)/src/LString.h
$(CXXCOMPILE) \
-DLYX_DIR=\"$(pkgdatadir)\" \
-DTOP_SRCDIR=\"$(top_srcdir)\" \
-DLOCALEDIR=\"$(localedir)\" \
-DLYX_DIR=\"$(LYX_ABS_INSTALLED_DATADIR)\" \
-DTOP_SRCDIR=\"$(LYX_ABS_TOP_SRCDIR)\" \
-DLOCALEDIR=\"$(LYX_ABS_INSTALLED_LOCALEDIR)\" \
-c $(top_srcdir)/src/support/package.C && \
echo "timestamp" > $@