From 6579488028f0fcd8173f49f11971ee0a4f9c99cb Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 14 Jun 2001 00:24:42 +0000
Subject: [PATCH] ChangeLog, ext2_types.h.in:   ext2_types.h.in: If
 linux/types.h has been defined, then don't try to   	redefine the typedefs.
 ChangeLog, Makefile.in:   Makefile.in: Make the install target depend on
 $(SUBS) to accomodate   	the fools who want to compile and install
 e2fsprogs as root using just   	one command.

---
 ChangeLog                  | 4 ++++
 Makefile.in                | 2 +-
 lib/ext2fs/ChangeLog       | 3 +++
 lib/ext2fs/ext2_types.h.in | 8 ++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 41cb2e8a..a958d547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-06-13  Theodore Tso  <tytso@valinux.com>
 
+	* Makefile.in: Make the install target depend on $(SUBS) to
+		accomodate the fools who want to compile and install
+		e2fsprogs as root using just one command.
+
 	* Makefile.in: Don't recurse into debugfs and resize subdirectory
 		if --disable-debugfs or --disable-resizer is given as a
 		configuration option.
diff --git a/Makefile.in b/Makefile.in
index 480aa8be..6c0eddbc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,7 +41,7 @@ clean-doc:
 distclean-doc:
 	cd doc && $(MAKE) distclean
 
-install: all-libs-recursive install-progs-recursive \
+install: $(SUBS) all-libs-recursive install-progs-recursive \
 	install-shlibs-libs-recursive install-doc-libs
 #	export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages
 
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 6e693b03..a1224c5a 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,5 +1,8 @@
 2001-06-13  Theodore Tso  <tytso@valinux.com>
 
+	* ext2_types.h.in: If linux/types.h has been defined, then don't
+		try to redefine the typedefs.
+
 	* Makefile.in (HFILES): Add ext2_types.h to the list of files
 		which should be installed.
 
diff --git a/lib/ext2fs/ext2_types.h.in b/lib/ext2fs/ext2_types.h.in
index 0731a010..38f588f8 100644
--- a/lib/ext2fs/ext2_types.h.in
+++ b/lib/ext2fs/ext2_types.h.in
@@ -1,6 +1,12 @@
 #ifndef _EXT2_TYPES_H
 #define _EXT2_TYPES_H
 
+/* 
+ * If linux/types.h is already been included, assume it has defined
+ * everything we need.  (cross fingers)
+ */
+#ifndef _LINUX_TYPES_H
+
 typedef unsigned char __u8;
 typedef signed char __s8;
 
@@ -42,4 +48,6 @@ typedef	unsigned short	__u32;
  ?== error: undefined 32 bit type
 #endif
 
+#endif /* LINUX_TYPES_H */
+
 #endif /* EXT2_TYPES_H */