Fix -DVERSION_EXTRA="foo"

It was broken since 58a34fa5ad (since ZNC 1.2)
This commit is contained in:
Alexey Sokolov
2015-07-21 22:43:18 +01:00
parent 34d9183ff1
commit baa798ce9f
3 changed files with 5 additions and 2 deletions

View File

@@ -11,6 +11,9 @@
#define VERSION (VERSION_MAJOR + VERSION_MINOR / 10.0)
// You can add -DVERSION_EXTRA="stuff" to your CXXFLAGS!
#ifndef VERSION_EXTRA
# define VERSION_EXTRA ""
#endif
extern const char* ZNC_VERSION_EXTRA;
#endif

View File

@@ -54,7 +54,7 @@ sed -e 's:#include "defines.h":#include <znc/defines.h>:' third_party/Csocket/Cs
rm make-tarball.sh
sed -e "s/THIS_IS_NOT_TARBALL//" -i Makefile.in
echo '#include <znc/version.h>' > src/version.cpp
echo "const char* ZNC_VERSION_EXTRA = \"$DESC\";" >> src/version.cpp
echo "const char* ZNC_VERSION_EXTRA = VERSION_EXTRA \"$DESC\";" >> src/version.cpp
)
(
cd $TMPDIR

View File

@@ -53,7 +53,7 @@ fi
if [ "x$WRITE_OUTPUT" = "xyes" ]
then
echo '#include <znc/version.h>' > src/version.cpp
echo "const char* ZNC_VERSION_EXTRA = \"$EXTRA\";" >> src/version.cpp
echo "const char* ZNC_VERSION_EXTRA = VERSION_EXTRA \"$EXTRA\";" >> src/version.cpp
fi
echo "$EXTRA"