diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-21 13:42:58 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2005-10-21 13:42:58 -0400 |
| commit | ab27642b59b68d18df5a9aa5fa81b5ab5735aa77 (patch) | |
| tree | afc2f191ef73e6eb1064de6358f44177d691aab0 /Makefile | |
| parent | ba9b543d5bec0a7605952e2ba501fb8b0f3b6407 (diff) | |
| parent | 654b1536b0927d189526b9063818e0790aa3ea23 (diff) | |
Merge branch 'master' of ssh://rsync.linux-nfs.org/home/trondmy/www_sites/rsync.linux-nfs.org/pub/linux/nfs-2.6
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -1,7 +1,7 @@ | |||
| 1 | VERSION = 2 | 1 | VERSION = 2 |
| 2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
| 3 | SUBLEVEL = 14 | 3 | SUBLEVEL = 14 |
| 4 | EXTRAVERSION =-rc4 | 4 | EXTRAVERSION =-rc5 |
| 5 | NAME=Affluent Albatross | 5 | NAME=Affluent Albatross |
| 6 | 6 | ||
| 7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
| @@ -372,7 +372,7 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve | |||
| 372 | # Files to ignore in find ... statements | 372 | # Files to ignore in find ... statements |
| 373 | 373 | ||
| 374 | RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg \) -prune -o | 374 | RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg \) -prune -o |
| 375 | RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg | 375 | export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg |
| 376 | 376 | ||
| 377 | # =========================================================================== | 377 | # =========================================================================== |
| 378 | # Rules shared between *config targets and build targets | 378 | # Rules shared between *config targets and build targets |