fix version.h generation for out-of-tree builds

[vpp.git] / src / vpp.am

diff --git a/src/vpp.am b/src/vpp.am
index a02206f..5128e8a 100644 (file)
--- a/src/vpp.am
+++ b/src/vpp.am
@@ -55,8 +55,8 @@ vpp/app/version.h:
        @echo "#define VPP_BUILD_DATE \"$$(date)\"" > $@
        @echo "#define VPP_BUILD_USER \"$$(whoami)\"" >> $@
        @echo "#define VPP_BUILD_HOST \"$$(hostname)\"" >> $@
-       @echo "#define VPP_BUILD_TOPDIR \"$$(git rev-parse --show-toplevel)\""  >> $@
-       @echo "#define VPP_BUILD_VER \"$$(../../scripts/version)\"" >> $@
+       @echo "#define VPP_BUILD_TOPDIR \"$$(cd $(srcdir) && git rev-parse --show-toplevel)\""  >> $@
+       @echo "#define VPP_BUILD_VER \"$$($(srcdir)/scripts/version)\"" >> $@
 
 # Generate a plugin configuration script. Misconfiguring a
 # plugin can cause very subtle problems.
@@ -74,7 +74,7 @@ PLUGIN_DPDK_ARG=""
 endif
 
 vpp_plugin_configure:
-       @echo "PLUGIN CONFIGURE " $@ 
+       @echo "PLUGIN CFG" $@
        @echo "#!/bin/bash" > $@
        @echo " " >> $@
        @echo "set +eu" >> $@