* 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/trunk@13763 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2006-04-27 16:44:43 +00:00
parent 57d0c03bf5
commit 18d72887a6
5 changed files with 7 additions and 44 deletions

View File

@ -475,8 +475,6 @@ AC_CONFIG_FILES([Makefile m4/Makefile \
src/frontends/qt4/moc/Makefile \ src/frontends/qt4/moc/Makefile \
src/frontends/qt4/ui/Makefile \ src/frontends/qt4/ui/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 AC_OUTPUT
# show version information # show version information

View File

@ -1,7 +1,5 @@
include $(top_srcdir)/config/common.am include $(top_srcdir)/config/common.am
DISTCLEANFILES += texput.log textclass.lst packages.lst lyxrc.defaults
SUBDIRS = doc lyx2lyx SUBDIRS = doc lyx2lyx
EXTRA_DIST = \ EXTRA_DIST = \
@ -13,8 +11,7 @@ CHMOD = chmod
# version-suffix would get appended to the names. So we use dist_pkgdata_DATA # version-suffix would get appended to the names. So we use dist_pkgdata_DATA
# and chmod manually in install-data-hook. # and chmod manually in install-data-hook.
dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx configure.py \ dist_pkgdata_DATA = lyxrc.example CREDITS chkconfig.ltx configure.py \
lyxrc.defaults textclass.lst packages.lst external_templates \ external_templates encodings languages symbols syntax.default
encodings languages symbols syntax.default
dist_noinst_DATA = \ dist_noinst_DATA = \
images/README \ images/README \
@ -930,9 +927,6 @@ dist_ui_DATA = \
ui/stdmenus.ui \ ui/stdmenus.ui \
ui/stdtoolbars.ui ui/stdtoolbars.ui
lyxrc.defaults: $(srcdir)/configure.py
python $<
install-data-hook: install-data-hook:
$(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py $(CHMOD) 755 $(DESTDIR)$(pkgdatadir)/configure.py
for i in $(dist_scripts_DATA); do \ for i in $(dist_scripts_DATA); do \

View File

@ -624,31 +624,6 @@ def checkTeXAllowSpaces():
removeFiles( [ 'a b.tex', 'a b.log', 'texput.log' ]) 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__': if __name__ == '__main__':
lyx_check_config = True lyx_check_config = True
outfile = 'lyxrc.defaults' outfile = 'lyxrc.defaults'
@ -705,4 +680,3 @@ Options:
# --without-latex-config can disable lyx_check_config # --without-latex-config can disable lyx_check_config
checkLatexConfig( lyx_check_config and LATEX != '', bool_docbook, bool_linuxdoc) checkLatexConfig( lyx_check_config and LATEX != '', bool_docbook, bool_linuxdoc)
createLaTeXConfig() createLaTeXConfig()
removeExtraFiles()

View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/common.am 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) EXTRA_DIST = depend.py doc_toc.py LyXConfig.lyx.in README.Documentation $(DEPENDFILE) $(docfiles)
@ -66,9 +66,7 @@ docfiles = \
platypus.eps platypus.eps
docdir = $(pkgdatadir)/doc docdir = $(pkgdatadir)/doc
doc_DATA = \ doc_DATA = $(docfiles)
$(docfiles) \
LaTeXConfig.lyx
DEPENDFILE = $(srcdir)/Makefile.depend DEPENDFILE = $(srcdir)/Makefile.depend
# include $(DEPENDFILE) does not work because automake is too limited. # include $(DEPENDFILE) does not work because automake is too limited.

View File

@ -250,10 +250,10 @@ get_build_dirs(string const & abs_binary,
{ {
string const check_text = "Checking whether LyX is run in place..."; string const check_text = "Checking whether LyX is run in place...";
// We're looking for "lyxrc.defaults" in a directory // We're looking for "Makefile" in a directory
// binary_dir/../lib // binary_dir/../lib
// We're also looking for "chkconfig.ltx" in a directory // We're also looking for "chkconfig.ltx" in a directory
// binary_dir/top_srcdir()/lib // top_srcdir()/lib
// If both are found, then we're running LyX in-place. // If both are found, then we're running LyX in-place.
// Note that the name of the lyx binary may be a symbolic link. // Note that the name of the lyx binary may be a symbolic link.
@ -265,11 +265,10 @@ get_build_dirs(string const & abs_binary,
string const build_support_dir = string const build_support_dir =
get_build_support_dir(binary_dir, top_build_dir_location); get_build_support_dir(binary_dir, top_build_dir_location);
if (!fileSearch(build_support_dir, "lyxrc.defaults").empty()) { if (!fileSearch(build_support_dir, "Makefile").empty()) {
// Try and find "chkconfig.ltx". // Try and find "chkconfig.ltx".
string const system_support_dir = string const system_support_dir =
makeAbsPath(addPath(top_srcdir(), "lib"), addPath(top_srcdir(), "lib");
addPath(binary_dir, "support"));
if (!fileSearch(system_support_dir, "chkconfig.ltx").empty()) { if (!fileSearch(system_support_dir, "chkconfig.ltx").empty()) {
lyxerr[Debug::INIT] << check_text << " yes" lyxerr[Debug::INIT] << check_text << " yes"