Re: [PATCH master 1/3] Export VERSIONEDSHAREDIR to _autoconf.py

[Jose A. Lopes]

On Mon, Sep 23, 2013 at 05:15:00PM +0200, Klaus Aehlig wrote:
> Signed-off-by: Klaus Aehlig <aeh...@google.com>
> ---
>  Makefile.am        | 2 ++
>  src/AutoConf.hs.in | 3 +++
>  2 files changed, 5 insertions(+)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 4ffeecc..829b5b0 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1801,6 +1801,7 @@ lib/_autoconf.py: Makefile | stamp-directories
>         echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; 
> \
>         echo "HTOOLS_PROGS = [$(foreach i,$(HS_HTOOLS_PROGS),'$(i)',)]"; \
>         echo "PKGLIBDIR = '$(libdir)/ganeti'"; \
> +       echo "VERSIONEDSHAREDIR = '$(versionedsharedir)'"; \
>         echo "DRBD_BARRIERS = '$(DRBD_BARRIERS)'"; \
>         echo "DRBD_NO_META_FLUSH = $(DRBD_NO_META_FLUSH)"; \
>         echo "SYSLOG_USAGE = '$(SYSLOG_USAGE)'"; \
> @@ -1875,6 +1876,7 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in | 
> stamp-directories
>           -DGNT_SCRIPTS="$(foreach i,$(notdir $(gnt_scripts)),\"$(i)\":)" \
>           -DHS_HTOOLS_PROGS="$(foreach i,$(HS_HTOOLS_PROGS),\"$(i)\":)" \
>           -DPKGLIBDIR="$(libdir)/ganeti" \
> +         -DVERSIONEDSHAREDIR="$(versionedsharedir)" \
>           -DDRBD_BARRIERS="$(DRBD_BARRIERS)" \
>           -DDRBD_NO_META_FLUSH="$(DRBD_NO_META_FLUSH)" \
>           -DSYSLOG_USAGE="$(SYSLOG_USAGE)" \
> diff --git a/src/AutoConf.hs.in b/src/AutoConf.hs.in
> index 2255637..efabe6c 100644
> --- a/src/AutoConf.hs.in
> +++ b/src/AutoConf.hs.in
> @@ -121,6 +121,9 @@ htoolsProgs = HS_HTOOLS_PROGS[]
>  pkglibdir :: String
>  pkglibdir = "PKGLIBDIR"
>  
> +versionedsharedir :: String
> +versionedsharedir = "VERSIONEDSHAREDIR"
> +
>  drbdBarriers :: String
>  drbdBarriers = "DRBD_BARRIERS"
>  
> -- 
> 1.8.4
> 

LGTM.

Thanks,
Jose