From: Andre Noll <maan@systemlinux.org>
Date: Fri, 23 Jan 2015 12:17:10 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/tarball-build-fix'
X-Git-Tag: v0.5.4~2
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=56d75bd90d78cf44cd3984ce2a45627ef5646d38;hp=-c

Merge branch 'refs/heads/t/tarball-build-fix'
---

56d75bd90d78cf44cd3984ce2a45627ef5646d38
diff --combined Makefile.real
index 217d1a3c,440220ce..6c7b38f2
--- a/Makefile.real
+++ b/Makefile.real
@@@ -51,7 -51,7 +51,7 @@@ play_objs := $(addprefix $(object_dir)/
  man_pages := $(patsubst %, $(man_dir)/%.1, $(prefixed_executables))
  
  autocrap := config.h.in configure
- tarball_pfx := $(PACKAGE_TARNAME)-$(shell git describe --dirty)
+ tarball_pfx := $(PACKAGE_TARNAME)-$(GIT_VERSION)
  tarball_delete := $(addprefix $(tarball_pfx)/, web .gitignore)
  tarball := $(tarball_pfx).tar.bz2
  
@@@ -188,8 -188,7 +188,8 @@@ error2.h: $(hostbin_dir)/error2 config.
  $(object_dir)/%.o: %.c | $(object_dir)
  
  $(object_dir)/opus%.o $(dep_dir)/opus%.d: CPPFLAGS += $(opus_cppflags)
 -$(object_dir)/gui%.o $(dep_dir)/gui%.d: CPPFLAGS += $(curses_cppflags)
 +$(object_dir)/gui.o $(object_dir)/gui%.o $(dep_dir)/gui%.d \
 +: CPPFLAGS += $(curses_cppflags)
  $(object_dir)/spx%.o $(dep_dir)/spx%.d: CPPFLAGS += $(speex_cppflags)
  $(object_dir)/flac%.o $(dep_dir)/flac%.d: CPPFLAGS += $(flac_cppflags)