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

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16355 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 2226954e6f2bb8585cb31e00252657e3ecb6db44..9bb4815e72eb1d01b8b62ac617a3b1a6e97c8942 100644 (file)
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -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 ;\

diff --git a/src/support/package.C.in b/src/support/package.C.in
index ef5bcfe599b4e490762e58004f7683ac17c2a14d..e41a1d9928ee9ae09142e99be80dddc7f0a4670c 100644 (file)
--- a/src/support/package.C.in
+++ b/src/support/package.C.in
@@ -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;
 }