Module Name: src
Committed By: christos
Date: Wed Jan 23 21:03:16 UTC 2013
Modified Files:
src/usr.sbin/makefs/msdos: Makefile.inc
src/usr.sbin/makefs/v7fs: Makefile.inc
Log Message:
don't reuse the same variables
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/makefs/msdos/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/makefs/v7fs/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/msdos/Makefile.inc
diff -u src/usr.sbin/makefs/msdos/Makefile.inc:1.1 src/usr.sbin/makefs/msdos/Makefile.inc:1.2
--- src/usr.sbin/makefs/msdos/Makefile.inc:1.1 Wed Jan 23 15:46:39 2013
+++ src/usr.sbin/makefs/msdos/Makefile.inc Wed Jan 23 16:03:15 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.1 2013/01/23 20:46:39 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/01/23 21:03:15 christos Exp $
#
MSDOS= ${NETBSDSRCDIR}/sys/fs/msdosfs
-NEWFS= ${NETBSDSRCDIR}/sbin/newfs_msdos
+MSDOS_NEWFS= ${NETBSDSRCDIR}/sbin/newfs_msdos
-.PATH: ${.CURDIR}/v7fs ${MSDOS} ${NEWFS}
+.PATH: ${.CURDIR}/v7fs ${MSDOS} ${MSDOS_NEWFS}
-CPPFLAGS+= -DMSDOS_EI -I${MSDOS} -I${NEWFS}
+CPPFLAGS+= -DMSDOS_EI -I${MSDOS} -I${MSDOS_NEWFS}
Index: src/usr.sbin/makefs/v7fs/Makefile.inc
diff -u src/usr.sbin/makefs/v7fs/Makefile.inc:1.4 src/usr.sbin/makefs/v7fs/Makefile.inc:1.5
--- src/usr.sbin/makefs/v7fs/Makefile.inc:1.4 Tue Jul 19 14:29:41 2011
+++ src/usr.sbin/makefs/v7fs/Makefile.inc Wed Jan 23 16:03:15 2013
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.inc,v 1.4 2011/07/19 18:29:41 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2013/01/23 21:03:15 christos Exp $
#
V7FS= ${NETBSDSRCDIR}/sys/fs/v7fs
-NEWFS= ${NETBSDSRCDIR}/sbin/newfs_v7fs
+V7FS_NEWFS= ${NETBSDSRCDIR}/sbin/newfs_v7fs
FSCK= ${NETBSDSRCDIR}/sbin/fsck # use progress meter.
-.PATH: ${.CURDIR}/v7fs ${V7FS} ${NEWFS} ${FSCK}
+.PATH: ${.CURDIR}/v7fs ${V7FS} ${V7FS_NEWFS} ${FSCK}
-CPPFLAGS+= -DV7FS_EI -I${V7FS} -I${NEWFS} -I${FSCK}
+CPPFLAGS+= -DV7FS_EI -I${V7FS} -I${V7FS_NEWFS} -I${FSCK}
SRCS += v7fs_endian.c v7fs_superblock.c v7fs_superblock_util.c v7fs_inode.c \
v7fs_inode_util.c v7fs_datablock.c v7fs_dirent.c v7fs_io.c v7fs_file.c \
@@ -17,4 +17,4 @@ SRCS += main.c # newfs
SRCS += progress.c # progress bar (fsck)
.endif
-SRCS += v7fs_estimate.c v7fs_populate.c
\ No newline at end of file
+SRCS += v7fs_estimate.c v7fs_populate.c
