summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLars Müller2007-04-29 14:34:31 +0200
committerLars Müller2007-04-29 14:34:31 +0200
commitf48efb5bc309ca94f5b70508917266e9c495f7f6 (patch)
tree66760a463f9cda8618ca08457d6c2a9a657b321c /Makefile
parent* corrected generation of wrong export name in PXE files. (diff)
downloadcore-f48efb5bc309ca94f5b70508917266e9c495f7f6.tar.gz
core-f48efb5bc309ca94f5b70508917266e9c495f7f6.tar.xz
core-f48efb5bc309ca94f5b70508917266e9c495f7f6.zip
Ensure to have the subversion revision included into the OpenSLX version
string by default. This default was accidently changed by revision 895. Thanks to Oliver who mentioned this on IRC. git-svn-id: http://svn.openslx.org/svn/openslx/trunk@952 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile13
1 files changed, 12 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 94c0c20a..3910d291 100644
--- a/Makefile
+++ b/Makefile
@@ -58,9 +58,17 @@ endif
tarball:
@OPENSLX_VERSION_SVNREV=$$( svnversion); \
+ if test "$${OPENSLX_SVN_SNAPSHOT}" = "0"; then \
+ unset OPENSLX_SVN_SNAPSHOT; \
+ echo "OPENSLX_SVN_SNAPSHOT=\"0\"" \
+ >REVISION; \
+ else \
+ OPENSLX_SVN_SNAPSHOT="1"; \
+ rm -f REVISION; \
+ fi; \
. ./VERSIONS; \
echo "OPENSLX_VERSION_SVNREV=\"$${OPENSLX_VERSION_SVNREV}\"" \
- >REVISION; \
+ >>REVISION; \
echo "Creating OpenSLX $${OPENSLX_VERSION_STRING} tar ball "; \
if test -e "../openslx-$${OPENSLX_VERSION_STRING}" -a \
! -L "../openslx-$${OPENSLX_VERSION_STRING}"; then \
@@ -212,6 +220,9 @@ functions via\n# inclusion: '. /etc/functions' ..." \
else \
OPENSLX_VERSION_SVNREV=$$(svnversion .); \
fi; \
+ test "$${OPENSLX_SVN_SNAPSHOT}" = "0" && \
+ unset OPENSLX_SVN_SNAPSHOT || \
+ OPENSLX_SVN_SNAPSHOT="1"; \
. ./VERSIONS; \
echo -e "#! /bin/sh\n\necho $${OPENSLX_VERSION_STRING}" \
> $(DESTDIR)${SLX_BIN_PATH}/slxversion