mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-13 09:15:50 +00:00
* src/support/package.C.in (get_build_dirs): Look at Makefile
instead of lyxrc.defaults. Simplify the check for chkconfig.ltx. * configure.ac: do not run lib/configure.py * lib/doc/Makefile.am: LaTeXConfig.lyx is not generated anymore. * lib/configure.py (removeExtraFiles): remove. * lib/Makefile.am: no files are generated in there. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_4_X@13764 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
83e0fdf99b
commit
9d509572db
@ -1,3 +1,7 @@
|
||||
2006-04-27 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.ac: do not run lib/configure.py
|
||||
|
||||
2006-04-25 Georg Baum <Georg.Baum@post.rwth-aachen.de>
|
||||
|
||||
* configure.ac: run lib/configure.py, not lib/configure
|
||||
|
@ -450,8 +450,6 @@ AC_CONFIG_FILES([Makefile m4/Makefile \
|
||||
src/frontends/qt2/ui/Makefile \
|
||||
src/frontends/qt2/ui/moc/Makefile \
|
||||
])
|
||||
echo "Running $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix=\"$version_suffix\""
|
||||
(test -d lib || mkdir lib; cd lib && python $LYX_ABS_TOP_SRCDIR/lib/configure.py --with-version-suffix="$version_suffix")
|
||||
|
||||
AC_OUTPUT
|
||||
# show version information
|
||||
|
@ -1,3 +1,9 @@
|
||||
2006-04-27 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* configure.py (removeExtraFiles): remove.
|
||||
|
||||
* Makefile.am: no files are generated in there.
|
||||
|
||||
2006-04-25 Georg Baum <Georg.Baum@post.rwth-aachen.de>
|
||||
|
||||
* configure.m4: Remove
|
||||
|
@ -1,7 +1,5 @@
|
||||
include $(top_srcdir)/config/common.am
|
||||
|
||||
DISTCLEANFILES += texput.log textclass.lst packages.lst lyxrc.defaults
|
||||
|
||||
SUBDIRS = doc lyx2lyx
|
||||
|
||||
EXTRA_DIST = \
|
||||
@ -13,8 +11,7 @@ CHMOD = chmod
|
||||
# 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 \
|
||||
lyxrc.defaults textclass.lst packages.lst external_templates \
|
||||
encodings languages symbols syntax.default
|
||||
external_templates encodings languages symbols syntax.default
|
||||
|
||||
binddir = $(pkgdatadir)/bind
|
||||
dist_bind_DATA = \
|
||||
@ -897,9 +894,6 @@ dist_ui_DATA = \
|
||||
ui/stdmenus.ui \
|
||||
ui/stdtoolbars.ui
|
||||
|
||||
lyxrc.defaults: $(srcdir)/configure.py
|
||||
python $<
|
||||
|
||||
install-data-hook:
|
||||
$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py
|
||||
for i in $(dist_scripts_DATA); do \
|
||||
|
@ -624,31 +624,6 @@ def checkTeXAllowSpaces():
|
||||
removeFiles( [ 'a b.tex', 'a b.log', 'texput.log' ])
|
||||
|
||||
|
||||
def removeExtraFiles():
|
||||
# Remove superfluous files if we are not writing in the main lib
|
||||
# directory
|
||||
for file in [outfile, 'textclass.lst', 'packages.lst', \
|
||||
'doc/LaTeXConfig.lyx']:
|
||||
try:
|
||||
# we rename the file first, so that we avoid comparing a file with itself
|
||||
os.rename(file, file + '.new')
|
||||
syscfg = open( os.path.join(srcdir, file) ).read()
|
||||
mycfg = open( file + '.new').read()
|
||||
if mycfg == syscfg:
|
||||
print "removing ", file, " which is identical to the system global version"
|
||||
removeFiles( [file + '.new'] )
|
||||
else:
|
||||
os.rename( file + '.new', file )
|
||||
except: # use local version if anthing goes wrong.
|
||||
os.rename( file + '.new', file )
|
||||
pass
|
||||
# Final clean-up
|
||||
if not lyx_keep_temps:
|
||||
removeFiles(['chkconfig.sed', 'chkconfig.vars', \
|
||||
'wrap_chkconfig.ltx', 'wrap_chkconfig.log', \
|
||||
'chklayouts.tex', 'missfont.log'])
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
lyx_check_config = True
|
||||
outfile = 'lyxrc.defaults'
|
||||
@ -705,4 +680,3 @@ Options:
|
||||
# --without-latex-config can disable lyx_check_config
|
||||
checkLatexConfig( lyx_check_config and LATEX != '', bool_docbook, bool_linuxdoc)
|
||||
createLaTeXConfig()
|
||||
removeExtraFiles()
|
||||
|
@ -1,3 +1,7 @@
|
||||
2006-04-27 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* Makefile.am: LaTeXConfig.lyx is not generated anymore.
|
||||
|
||||
2006-04-24 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* de_Extended.lyx:
|
||||
|
@ -1,6 +1,6 @@
|
||||
include $(top_srcdir)/config/common.am
|
||||
|
||||
DISTCLEANFILES += LyXConfig.lyx LaTeXConfig.lyx $(tocfiles)
|
||||
DISTCLEANFILES += $(tocfiles)
|
||||
|
||||
EXTRA_DIST = depend.py doc_toc.py LyXConfig.lyx.in README.Documentation $(DEPENDFILE) $(docfiles)
|
||||
|
||||
@ -66,9 +66,7 @@ docfiles = \
|
||||
platypus.eps
|
||||
|
||||
docdir = $(pkgdatadir)/doc
|
||||
doc_DATA = \
|
||||
$(docfiles) \
|
||||
LaTeXConfig.lyx
|
||||
doc_DATA = $(docfiles)
|
||||
|
||||
DEPENDFILE = $(srcdir)/Makefile.depend
|
||||
# include $(DEPENDFILE) does not work because automake is too limited.
|
||||
|
@ -35,8 +35,10 @@ src/frontends/controllers/character.C
|
||||
src/frontends/controllers/frnt_lang.C
|
||||
src/frontends/controllers/helper_funcs.C
|
||||
src/frontends/gtk/Dialogs.C
|
||||
src/frontends/gtk/GAboutlyx.C
|
||||
src/frontends/gtk/GBC.h
|
||||
src/frontends/gtk/GBibItem.C
|
||||
src/frontends/gtk/GBibtex.C
|
||||
src/frontends/gtk/GBox.C
|
||||
src/frontends/gtk/GBranch.C
|
||||
src/frontends/gtk/GChanges.C
|
||||
@ -54,6 +56,7 @@ src/frontends/gtk/GMathPanel.C
|
||||
src/frontends/gtk/GMathsMatrix.C
|
||||
src/frontends/gtk/GNote.C
|
||||
src/frontends/gtk/GParagraph.C
|
||||
src/frontends/gtk/GPreferences.C
|
||||
src/frontends/gtk/GRef.C
|
||||
src/frontends/gtk/GSearch.C
|
||||
src/frontends/gtk/GSendto.C
|
||||
|
@ -1,5 +1,8 @@
|
||||
2006-04-27 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
|
||||
|
||||
* package.C.in (get_build_dirs): Look at Makefile instead of
|
||||
lyxrc.defaults. Simplify the check for chkconfig.ltx.
|
||||
|
||||
* package.C.in (relative_locale_dir): fix for Windows and OSX.
|
||||
|
||||
2006-04-25 Georg Baum <Georg.Baum@post.rwth-aachen.de>
|
||||
|
@ -85,6 +85,9 @@ What's new
|
||||
- Fix lib/configure.py to find tex2lyx when compiling with
|
||||
--with-version-suffix (bug 2285)
|
||||
|
||||
- It is not needed anymore to run lib/configure.py in the main LyX
|
||||
support directory.
|
||||
|
||||
- Fix lib/configure.py to find tex2lyx if the path to it contains spaces.
|
||||
|
||||
- Fix the code to find interface localization under Windows and Mac OS X.
|
||||
|
Loading…
Reference in New Issue
Block a user