diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-09 01:24:01 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-09 01:24:01 +0000 |
commit | f1b12eb265b7715199ea2509fe59f1bcf5533cd8 (patch) | |
tree | d0bfbc4229f755e556a4e45acf0676afb1b90067 | |
parent | 059a07af713d033de499a5113790655a2ec0a3e4 (diff) | |
download | mpv-f1b12eb265b7715199ea2509fe59f1bcf5533cd8.tar.bz2 mpv-f1b12eb265b7715199ea2509fe59f1bcf5533cd8.tar.xz |
CC version check done by Makefile to allow overriding CC from envvar
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3391 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | Makefile | 4 | ||||
-rwxr-xr-x | version.sh | 4 |
2 files changed, 3 insertions, 5 deletions
@@ -218,7 +218,7 @@ distclean: dep: depend depend: - ./version.sh + ./version.sh `$(CC) --version` $(CC) -MM $(CFLAGS) mplayer.c mencoder.c $(SRCS_MPLAYER) $(SRCS_MENCODER) 1>.depend @for a in $(PARTS); do $(MAKE) -C $$a dep; done @@ -233,7 +233,7 @@ config.h: configure # rebuild at every config.h/config.mak change: version.h: config.h config.mak Makefile - ./version.sh + ./version.sh `$(CC) --version` ifeq ($(wildcard .developer),) $(MAKE) distclean endif diff --git a/version.sh b/version.sh index c33b714159..b43ccfe7a5 100755 --- a/version.sh +++ b/version.sh @@ -5,7 +5,5 @@ if [ $? -ne 0 ]; then # probably no gnu date installed(?), use current date last_cvs_update=`date +%y%m%d-%H:%M` fi -cc=`cat config.mak |grep CC | cut -d '=' -f 2` -cc_version=`${cc} --version` -echo "#define VERSION \"CVS-${last_cvs_update}${cc}-${cc_version} \"" >version.h +echo "#define VERSION \"CVS-${last_cvs_update}-$1 \"" >version.h |