--- openssl-0.9.7m.orig/fips-1.0/Makefile	Thu Jan 18 13:29:15 2007
+++ openssl-0.9.7m/fips-1.0/Makefile	Thu Sep 20 20:06:49 2007
@@ -158,27 +158,29 @@
 	done;
 
 install:
-	@headerlist="$(EXHEADER)"; for i in $$headerlist ;\
+	@if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
+	headerlist="$(EXHEADER)"; for i in $$headerlist ;\
 	do \
 		(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
 		chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
-	done;
-	@for i in $(FDIRS) ;\
+	done && \
+	for i in $(FDIRS) ;\
 	do \
 		(cd $$i && echo "making install in fips/$$i..." && \
 		$(MAKE) CC='$(CC)' CFLAG='${CFLAG}' INSTALL_PREFIX='${INSTALL_PREFIX}'  INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' install ); \
-	done;
-	@for i in $(EXE) ; \
+	done && \
+	for i in $(EXE) ; \
 	do \
 		echo "installing $$i"; \
 		cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
 		chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new; \
 		mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$i; \
-	done
-	@cp -p -f fipscanister.o fipscanister.o.sha1 fips_premain.c \
+	done && \
+	cp -p -f fipscanister.o fipscanister.o.sha1 fips_premain.c \
 		fips_premain.c.sha1 \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/; \
-	chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips*
+		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/ && \
+	chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips*; \
+	fi # if fips
 
 lint:
 	@for i in $(FDIRS) ;\