nps: jnet/Makefile - removed redhat specific hacks

baggins baggins at pld-linux.org
Sun Sep 25 22:04:05 CEST 2005


Author: baggins                      Date: Sun Sep 25 20:04:05 2005 GMT
Module: nps                           Tag: HEAD
---- Log message:
- removed redhat specific hacks

---- Files affected:
nps/jnet:
   Makefile (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: nps/jnet/Makefile
diff -u nps/jnet/Makefile:1.3 nps/jnet/Makefile:1.4
--- nps/jnet/Makefile:1.3	Sun Sep 25 21:38:42 2005
+++ nps/jnet/Makefile	Sun Sep 25 22:03:59 2005
@@ -63,7 +63,7 @@
 
 ###########################################################################
 # Build rules
-.PHONY: clean install uninstall preinstall postinstall postuninstall
+.PHONY: clean install uninstall postinstall postuninstall
 
 ifeq ($(KERNEL_VERSION),2.4)
   include $(TOPDIR)/jnet/makefile.2_4
@@ -73,7 +73,7 @@
   endif
 endif
 
-install: preinstall
+install:
 	# remove all old versions of the driver
 	find $(DESTDIR)/lib/modules/$(KVER) -name $(TARGET) -exec rm {} \; \
 		|| true
@@ -103,21 +103,6 @@
 	/sbin/depmod -a
 	rm -rf /etc/newisys/jnet
 	make postuninstall
-
-#
-# if we are running RH9, we need to add a flag to the network config file
-#
-preinstall:
-ifeq (,$(BUILD_FROM_RPM))
-	if `uname -r | grep -v "grep" | grep -q "2.4.2[01]-"` ; then \
-          if [ -f /etc/sysconfig/network ] ; then \
-            if ! `grep -q NOZEROCONF.*yes $(DESTDIR)/etc/sysconfig/network` ; then \
-              echo "NOZEROCONF=yes $(DESTDIR)/etc/sysconfig/network" ;\
-              echo "NOZEROCONF=yes" >> $(DESTDIR)/etc/sysconfig/network ;\
-            fi ;\
-          fi ;\
-        fi
-endif
 
 #
 # 1.  need to add a file for JNET's ip address
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/nps/jnet/Makefile?r1=1.3&r2=1.4&f=u




More information about the pld-cvs-commit mailing list