X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=m4%2Fgengetopt%2Fmakefile;h=c816bd74ad8669b469417144e9aa01f13bdd6589;hb=b59e0eeefe6b51a26c1165f587bf3776369460a5;hp=05be1379c4f665314e402849b1ecefba680dfa74;hpb=c5e38315901ea63efd169af5d4ba3f3c66db7de9;p=paraslash.git

diff --git a/m4/gengetopt/makefile b/m4/gengetopt/makefile
index 05be1379..c816bd74 100644
--- a/m4/gengetopt/makefile
+++ b/m4/gengetopt/makefile
@@ -1,6 +1,6 @@
 define ggo_opts
 	--output-dir=$(cmdline_dir) \
-	--set-version="$(PACKAGE_VERSION)" \
+	--set-version="$(GIT_VERSION) ($(codename))" \
 	--arg-struct-name=$(*F)_args_info \
 	--file-name=$(*F).cmdline \
 	--func-name=$(*F)_cmdline_parser \
@@ -9,9 +9,12 @@ endef
 
 .PRECIOUS: $(cmdline_dir)/%.cmdline.c $(cmdline_dir)/%.cmdline.h $(ggo_dir)/%.ggo
 
-$(cmdline_dir)/%.cmdline.h $(cmdline_dir)/%.cmdline.c: $(ggo_dir)/%.ggo | $(cmdline_dir)
+$(cmdline_dir)/%.cmdline.h $(cmdline_dir)/%.cmdline.c: $(ggo_dir)/%.ggo git-version.h | $(cmdline_dir)
 	@[ -z "$(Q)" ] || echo 'GGO $<'
 	$(Q) $(GENGETOPT) $(ggo_opts) < $<
+ifeq ($(ggo_descriptions_declared),no)
+	echo 'extern const char *$(*F)_args_info_description;' >> $(cmdline_dir)/$(*F).cmdline.h
+endif
 
 $(ggo_dir)/server.ggo $(ggo_dir)/audiod.ggo: \
 	$(m4_ggo_dir)/loglevel.m4 $(m4_ggo_dir)/color.m4 \