From f966980937abd4899a9c43329041bb00798ab18e Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 7 Feb 2014 11:14:52 -0800 Subject: Replace "svn" with "git" all over the place. Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs --- Makefile.common | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile.common') diff --git a/Makefile.common b/Makefile.common index f47aa9389e..e585a06601 100644 --- a/Makefile.common +++ b/Makefile.common @@ -25,7 +25,7 @@ # "BUILT_SOURCES" are built before any "make all" or "make check" targets. BUILT_HEADER_FILES = \ - svnversion.h + version.h BUILT_C_FILES = @@ -54,7 +54,7 @@ SHARK_COMMON_SRC = \ # corresponding headers SHARK_COMMON_INCLUDES = \ - svnversion.h \ + version.h \ capture-pcap-util.h \ capture-pcap-util-int.h \ cfile.h \ @@ -156,7 +156,7 @@ editcap_SOURCES = \ # reordercap specifics reordercap_SOURCES = \ reordercap.c \ - svnversion.h + version.h # capinfos specifics capinfos_SOURCES = \ -- cgit v1.2.3