diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-06 21:03:59 +0000 |
| commit | e2b908c356746281aba48128da7dc15a28f5a773 (patch) | |
| tree | 5f0a12dfa33c059d8fe09d9a5a792792f44189a6 /mesalib/Makefile | |
| parent | 1fc1b7f67928082b9e922463be25c232d9bcba6a (diff) | |
| parent | 704e01fc69ebf6302aa1876906805147248abdaa (diff) | |
| download | vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.gz vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.tar.bz2 vcxsrv-e2b908c356746281aba48128da7dc15a28f5a773.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/Makefile')
| -rw-r--r-- | mesalib/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesalib/Makefile b/mesalib/Makefile index 814d20eb2..8c926bda6 100644 --- a/mesalib/Makefile +++ b/mesalib/Makefile @@ -5,7 +5,10 @@ TOP = . SUBDIRS = src
+# The git command below generates an empty string when we're not
+# building in a GIT tree (i.e., building from a release tarball).
default: $(TOP)/configs/current
+ @$(TOP)/bin/extract_git_sha1
@for dir in $(SUBDIRS) ; do \
if [ -d $$dir ] ; then \
(cd $$dir && $(MAKE)) || exit 1 ; \
@@ -199,6 +202,7 @@ MAIN_FILES = \ $(DIRECTORY)/aclocal.m4 \
$(DIRECTORY)/bin/config.guess \
$(DIRECTORY)/bin/config.sub \
+ $(DIRECTORY)/bin/extract_git_sha1 \
$(DIRECTORY)/bin/install-sh \
$(DIRECTORY)/bin/mklib \
$(DIRECTORY)/bin/minstall \
|