patch-2.1.60 linux/fs/Makefile

• Lines: 28
• Date: Thu Oct 23 14:00:14 1997
• Orig file: v2.1.59/linux/fs/Makefile
• Orig date: Tue Sep 23 16:48:48 1997

diff -u --recursive --new-file v2.1.59/linux/fs/Makefile linux/fs/Makefile
@@ -17,7 +17,7 @@
 
 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
@@ -107,6 +107,18 @@
 else
   ifeq ($(CONFIG_LOCKD),m)
   MOD_SUB_DIRS := lockd $(MOD_SUB_DIRS)
+  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