Their value is hard coded in the Makefile and cannot be changed at build time.
The ENVPREFIX instance in install-data-hook will be handled later. Signed-off-by: Gaetan Nadon <[email protected]> --- Makefile.am | 4 +--- commands/ListContexts | 4 ++-- commands/ListGenericCommands | 8 ++++---- config.in | 8 ++++---- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 18da0db..b07dda8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,9 +40,7 @@ rstartd_real_SOURCES = \ rstart_DATA = config -CONFIG_SUBSTS = -e 's|@rstartdir[@]|$(rstartdir)|g' \ - -e 's|PACKAGEname|rstart|g' \ - -e 's|ENVPREFIX|RSTART|g' +CONFIG_SUBSTS = -e 's|@rstartdir[@]|$(rstartdir)|g' config: config.in $(AM_V_GEN)$(SED) $(CONFIG_SUBSTS) < $< > $@ diff --git a/commands/ListContexts b/commands/ListContexts index c495bde..1ac0744 100644 --- a/commands/ListContexts +++ b/commands/ListContexts @@ -26,8 +26,8 @@ list=@List -for i in $ENVPREFIX_GLOBAL_CONTEXTS \ - $HOME/$ENVPREFIX_LOCAL_CONTEXTS +for i in $RSTART_GLOBAL_CONTEXTS \ + $HOME/$RSTART_LOCAL_CONTEXTS do if test -f $i/$list then diff --git a/commands/ListGenericCommands b/commands/ListGenericCommands index 9289a39..f2723b5 100644 --- a/commands/ListGenericCommands +++ b/commands/ListGenericCommands @@ -26,10 +26,10 @@ cmdlist=@List -for i in $ENVPREFIX_GLOBAL_COMMANDS \ - $ENVPREFIX_GLOBAL_COMMANDS/$ENVPREFIX_CONTEXT \ - $HOME/$ENVPREFIX_LOCAL_COMMANDS \ - $HOME/$ENVPREFIX_LOCAL_COMMANDS/$ENVPREFIX_CONTEXT +for i in $RSTART_GLOBAL_COMMANDS \ + $RSTART_GLOBAL_COMMANDS/$RSTART_CONTEXT \ + $HOME/$RSTART_LOCAL_COMMANDS \ + $HOME/$RSTART_LOCAL_COMMANDS/$RSTART_CONTEXT do if test -f $i/$cmdlist then diff --git a/config.in b/config.in index 87e306a..7545927 100644 --- a/config.in +++ b/config.in @@ -25,10 +25,10 @@ # First set up some important defaults. Can not find other config files # without these, and can not read some of this one without them! -internal-local-default .PACKAGEname +internal-local-default .rstart internal-global-contexts @rstartdir@/contexts -internal-local-contexts .PACKAGEname.contexts -internal-local-commands .PACKAGEname.commands +internal-local-contexts .rstart.contexts +internal-local-commands .rstart.commands internal-registries local posix x internal-global-commands @rstartdir@/commands -internal-variable-prefix ENVPREFIX +internal-variable-prefix RSTART -- 1.6.0.4 _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
