--- udunits-1.12.4/src/port/cfortran/cfortran.h.BAD	2005-03-25 22:15:13.000000000 -0600
+++ udunits-1.12.4/src/port/cfortran/cfortran.h	2005-03-25 22:17:24.000000000 -0600
@@ -83,7 +83,7 @@
 #if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)||defined(pgiFortran))
 #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
 /* If no Fortran compiler is given, we choose one for the machines we know.   */
-#if defined(lynx) || defined(VAXUltrix)
+#if defined(lynx) || defined(VAXUltrix) || defined(__linux__)
 #define f2cFortran    /* Lynx:      Only support f2c at the moment.
                          VAXUltrix: f77 behaves like f2c.
                            Support f2c or f77 with gcc, vcc with f2c. 
--- udunits-1.12.4/src/Makefile.in.BAD	2005-03-25 23:03:01.000000000 -0600
+++ udunits-1.12.4/src/Makefile.in	2005-03-25 23:03:14.000000000 -0600
@@ -68,7 +68,7 @@
 @PERL_DISTCLEAN@ dummy:	perl/Makefile
 
 perl/Makefile:		perl/Makefile.PL
-	-cd perl && $(PERL) Makefile.PL
+	-cd perl && $(PERL) Makefile.PL PREFIX=$(RPM_BUILD_ROOT)/usr INSTALLDIRS=vendor
 
 install:	whatis
 
--- udunits-1.12.4/src/lib/Makefile.in.BAD	2005-03-25 23:28:38.000000000 -0600
+++ udunits-1.12.4/src/lib/Makefile.in	2005-03-25 23:28:56.000000000 -0600
@@ -7,7 +7,7 @@
 LIBRARY		= udunits
 
 FLEX		= /usr/local/gnu/bin/flex
-cpp_path	= -DUT_DEFAULT_PATH='"$(prefix)/etc/udunits.dat"'
+cpp_path	= -DUT_DEFAULT_PATH='"/etc/udunits.dat"'
 CPPFLAGS	= -I../port/misc -I../port/cfortran $(cpp_path) @CPPFLAGS@
 CFLAGS		= @CFLAGS@
 
--- udunits-1.12.4/src/port/master.mk.in.BAD	2005-03-25 23:37:16.000000000 -0600
+++ udunits-1.12.4/src/port/master.mk.in	2005-03-25 23:37:25.000000000 -0600
@@ -351,7 +351,7 @@
 ############################################################################
 # `etc/' files:
 ############################################################################
-ETCDIR	= $(prefix)/etc
+ETCDIR	= $(RPM_BUILD_ROOT)/etc
 ETCFILE	= dummy-etcfile		# to silence GNU make(1)
 
 installed_etcfiles:
--- udunits-1.12.4/src/lib/Makefile.in.BAD	2005-04-11 11:45:36.000000000 -0500
+++ udunits-1.12.4/src/lib/Makefile.in	2005-04-11 11:46:17.000000000 -0500
@@ -6,7 +6,7 @@
 
 LIBRARY		= udunits
 
-FLEX		= /usr/local/gnu/bin/flex
+FLEX		= /usr/bin/flex
 cpp_path	= -DUT_DEFAULT_PATH='"/etc/udunits.dat"'
 CPPFLAGS	= -I../port/misc -I../port/cfortran $(cpp_path) @CPPFLAGS@
 CFLAGS		= @CFLAGS@
--- udunits-1.12.4/src/port/master.mk.in.BAD	2005-04-11 11:44:37.000000000 -0500
+++ udunits-1.12.4/src/port/master.mk.in	2005-04-11 11:44:55.000000000 -0500
@@ -382,7 +382,7 @@
 ############################################################################
 # Manual Pages:
 ############################################################################
-MANDIR		= $(prefix)/man
+MANDIR		= $(prefix)/share/man
 MANUAL		= dummy-manual	# to slience GNU make
 WHATIS		= @WHATIS@
 # The following macro should be empty on systems that don't