anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-07 12:32:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the rule to generate package.C from %VAR% to @VAR@

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16355 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-12-21 09:48:26 +00:00
parent e2eb27d76e
commit d3cad65fe2
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/support/Makefile.am
View File

@ -94,10 +94,10 @@ package.C: build_package
# Solaris sed does not like spaces bewteen the ;-delimited commands
build_package: package.C.in
@rm -f tmp_package ;\
sed "s,%LYX_DIR%,$(LYX_ABS_INSTALLED_DATADIR),;\
s,%LOCALEDIR%,$(LYX_ABS_INSTALLED_LOCALEDIR),;\
s,%TOP_SRCDIR%,$(LYX_ABS_TOP_SRCDIR),;\
s,%PROGRAM_SUFFIX%,$(program_suffix)," \
sed "s,@LYX_DIR@,$(LYX_ABS_INSTALLED_DATADIR),;\
s,@LOCALEDIR@,$(LYX_ABS_INSTALLED_LOCALEDIR),;\
s,@TOP_SRCDIR@,$(LYX_ABS_TOP_SRCDIR),;\
s,@PROGRAM_SUFFIX@,$(program_suffix)," \
$(srcdir)/package.C.in > tmp_package ;\
if cmp -s tmp_package package.C ; then \
rm -f tmp_package ;\

12
src/support/package.C.in
View File

@ -172,28 +172,28 @@ namespace {
// configuration-time.
string const top_srcdir()
{
static string const dir("%TOP_SRCDIR%");
static string const dir("@TOP_SRCDIR@");
return dir;
}
string const hardcoded_localedir()
{
return string("%LOCALEDIR%");
return string("@LOCALEDIR@");
}
string const hardcoded_system_support_dir()
{
return string("%LYX_DIR%");
return string("@LYX_DIR@");
}
string const & with_version_suffix()
{
static string const program_suffix("%PROGRAM_SUFFIX%");
static string const program_suffix("@PROGRAM_SUFFIX@");
static string const
with_version_suffix(" --with-version-suffix=%PROGRAM_SUFFIX%");
with_version_suffix(" --with-version-suffix=@PROGRAM_SUFFIX@");
return program_suffix.empty() ? program_suffix : with_version_suffix;
}
@ -202,7 +202,7 @@ string const & with_version_suffix()
string const & Package::top_srcdir() const
{
static string const dir("%TOP_SRCDIR%");
static string const dir("@TOP_SRCDIR@");
return dir;
}