diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /fs/Makefile | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'fs/Makefile')
| -rw-r--r-- | fs/Makefile | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/fs/Makefile b/fs/Makefile index 871524350..0b0f5f5ee 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -17,7 +17,7 @@ O_OBJS = open.o read_write.o devices.o file_table.o buffer.o \ MOD_LIST_NAME := FS_MODULES ALL_SUB_DIRS = minix ext2 fat msdos vfat proc isofs nfs umsdos \ - hpfs sysv smbfs ncpfs ufs affs romfs autofs lockd nfsd + hpfs sysv smbfs ncpfs ufs affs romfs autofs lockd nfsd nls ifeq ($(CONFIG_QUOTA),y) O_OBJS += dquot.o @@ -110,6 +110,18 @@ else endif endif +# Since CONFIG_NLS might be set to y while there are modules +# to be build in the nls/ directory, we need to enter the nls +# directory every time, but with different rules. +ifeq ($(CONFIG_NLS),y) +SUB_DIRS += nls +MOD_IN_SUB_DIRS += nls +else + ifeq ($(CONFIG_NLS),m) + MOD_SUB_DIRS += nls + endif +endif + ifeq ($(CONFIG_UMSDOS_FS),y) SUB_DIRS += umsdos else |