diff -urNp dieharder-2.24.7.org/dieharder/Makefile.am dieharder-2.24.7/dieharder/Makefile.am
--- dieharder-2.24.7.org/dieharder/Makefile.am	2007-12-06 21:49:02.000000000 +0200
+++ dieharder-2.24.7/dieharder/Makefile.am	2008-03-08 13:35:07.000000000 +0200
@@ -49,13 +49,10 @@ DEFINES = -DVERSION=$(VERSION)
 # Define parameters and directives needed in compile/link steps.
 #========================================================================
 # C Compiler
-CC = gcc
+#CC = gcc
 
 # Compile flags (use fairly standard -O3 as default)
-CFLAGS = -O3 -I ../include $(DEFINES) 
-
-# Linker flags.
-LDFLAGS =
+CFLAGS += -I ../include $(DEFINES) 
 
 # Libraries
 LIBS = -L ../libdieharder -ldieharder -lgsl -lgslcblas -lm
@@ -105,11 +102,10 @@ clean : 
 	- rm -f core $(PROGRAM) *.o $(PROGRAM).1.gz
 
 install : $(PROGRAM)
-	(install -d $(prefix)/bin; \
-	install -m 755 $(PROGRAM) $(prefix)/bin; \
-	install -d $(prefix)/share/man/man1; \
-	gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \
-	install -m 644 $(PROGRAM).1.gz $(prefix)/share/man/man1)
+	(install -d $(DESTDIR)$(bindir); \
+	install -m 755 $(PROGRAM) $(DESTDIR)$(bindir); \
+	install -d $(DESTDIR)$(mandir)/man1; \
+	install -m 644 $(PROGRAM).1 $(DESTDIR)$(mandir)/man1)
 
 #========================================================================
 # We give all generic rules below.  Currently we only need a rule for 
diff -urNp dieharder-2.24.7.org/libdieharder/Makefile.am dieharder-2.24.7/libdieharder/Makefile.am
--- dieharder-2.24.7.org/libdieharder/Makefile.am	2007-12-06 21:49:01.000000000 +0200
+++ dieharder-2.24.7/libdieharder/Makefile.am	2008-03-08 13:34:41.000000000 +0200
@@ -48,13 +48,13 @@ DEFINES = -DVERSION=$(VERSION)
 # Define parameters and directives needed in compile/link steps.
 #========================================================================
 # C Compiler
-CC = gcc
+#CC = gcc
 
 # Compile flags (use fairly standard -O3 as default)
-CFLAGS = -O3 -I ../include $(DEFINES) 
+CFLAGS += -I ../include $(DEFINES) 
 
 # Linker flags
-LDFLAGS = -g -fpic -shared -Wl,-soname,$(PROGLIB_SONAME)
+LDFLAGS += -g -fpic -shared -Wl,-soname,$(PROGLIB_SONAME)
 
 # Libraries
 LIBS = -lgsl -lgslcblas -lm
@@ -72,7 +72,7 @@ all: $(PROGLIB_SO_VERSION) # $(PROGLIB_A
 # 	ranlib $(PROGLIB_A)
 
 $(PROGLIB_SO_VERSION): $(LIBOBJECTS) $(LIBINCLUDES)
-	gcc $(LDFLAGS) -o $(PROGLIB_SO_VERSION) $(LIBOBJECTS)
+	$(CC) $(LDFLAGS) -o $(PROGLIB_SO_VERSION) $(LIBOBJECTS)
 	ldconfig -n .
 	ln -sf $(PROGLIB_SO_VERSION) $(PROGLIB_SO)
 
@@ -108,14 +108,13 @@ clean:
 # specfile for the dieharder package, in precisely the right locations.
 #========================================================================
 install: $(PROGLIB_SO_VERSION) $(PROGLIB_A) $(PROGMAN)
-	(install -d $(libdir); \
-	install -m 755 $(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO_VERSION); \
-        ln -sf $(libdir)/$(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO); \
-	install -d $(includedir)/dieharder; \
-	install -m 644 ../include/dieharder/*.h $(includedir)/dieharder; \
-	install -d $(prefix)/share/man/man3; \
-	gzip -c -9 $(PROGMAN) > $(PROGMAN).gz; \
-	install -m 644 $(DIR).3.gz $(prefix)/share/man/man3)
+	(install -d $(DESTDIR)$(libdir); \
+	install -m 755 $(PROGLIB_SO_VERSION) $(DESTDIR)$(libdir)/$(PROGLIB_SO_VERSION); \
+        ln -sf $(libdir)/$(PROGLIB_SO_VERSION) $(DESTDIR)$(libdir)/$(PROGLIB_SO); \
+	install -d $(DESTDIR)$(includedir)/dieharder; \
+	install -m 644 ../include/dieharder/*.h $(DESTDIR)$(includedir)/dieharder; \
+	install -d $(DESTDIR)$(mandir)/man3; \
+	install -m 644 $(DIR).3 $(DESTDIR)$(mandir)/man3)
 
 # FC requires no static lib install
 # 	install -m 755 $(PROGLIB_A) $(libdir)/$(PROGLIB_A); \