34 lines
1.5 KiB
Plaintext
34 lines
1.5 KiB
Plaintext
$OpenBSD: patch-Makefile_common,v 1.6 2011/11/12 12:59:58 jsg Exp $
|
|
--- Makefile.common.orig Wed Jul 27 23:40:23 2011
|
|
+++ Makefile.common Fri Nov 11 15:35:24 2011
|
|
@@ -159,29 +159,6 @@ VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
|
|
VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)
|
|
VER_EXTRA = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c2-)
|
|
|
|
-
|
|
-######################################################################
|
|
-# Get git's working copy information
|
|
-######################################################################
|
|
-
|
|
-ifneq ($(shell cd $(srcdir); git rev-parse --verify HEAD 1>/dev/null 2>&1 || echo "error"),error)
|
|
-GITROOT := $(srcdir)
|
|
-ifeq ($(origin VER_REV), undefined)
|
|
-# Are there uncommitted changes? (describe --dirty is only available since 1.6.6)
|
|
-VER_DIRTY := $(shell cd $(srcdir); git update-index --refresh --unmerged 1>/dev/null 2>&1; git diff-index --quiet HEAD || echo "-dirty")
|
|
-# Get the working copy base revision
|
|
-VER_REV := $(shell cd $(srcdir); git describe --match desc/\* | cut -d '-' -f 2-)$(VER_DIRTY)
|
|
-endif
|
|
-else
|
|
-GITROOT := git://github.com/scummvm/scummvm.git
|
|
-endif
|
|
-
|
|
-# Define the Subversion revision if available, either autodetected or
|
|
-# specified by the user, but only for base/version.cpp.
|
|
-ifneq ($(origin VER_REV), undefined)
|
|
-base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_REVISION=\"$(VER_REV)\"
|
|
-endif
|
|
-
|
|
######################################################################
|
|
# Distribution settings
|
|
######################################################################
|