Author: baggins Date: Sun Sep 25 19:53:08 2005 GMT
Module: nps Tag: HEAD
---- Log message:
- cleaned up (un)install
---- Files affected:
nps/poci:
Makefile (1.11 -> 1.12)
---- Diffs:
================================================================
Index: nps/poci/Makefile
diff -u nps/poci/Makefile:1.11 nps/poci/Makefile:1.12
--- nps/poci/Makefile:1.11 Sun Sep 25 21:38:42 2005
+++ nps/poci/Makefile Sun Sep 25 21:53:03 2005
@@ -42,7 +42,7 @@
endif
endif
-.PHONY: all install uninstall postinstall preuninstall postuninstall clean
+.PHONY: all install uninstall clean
all: nws_mc nws_hb nws_poci jnetctl
@@ -68,42 +68,16 @@
install -m744 nws_mc $(DESTDIR)/usr/sbin
install -m744 nws_hb $(DESTDIR)/usr/sbin
install -m744 nws_poci $(DESTDIR)/usr/sbin
- install -m744 script/poci.init $(DESTDIR)/etc/rc.d/init.d
+ install -m744 script/poci.init $(DESTDIR)/etc/rc.d/init.d/poci
sed -e "s/<SWInstalledDate>.*</<SWInstalledDate>`date +%s`</" \
-e "s/SWInfo\(.*\)</SWInfo\1 Source</" \
-e "[EMAIL PROTECTED]@bits>$(BITS)</bits>@" \
- < swinventory.xml > swinventory.new
- mv swinventory.new swinventory.xml
- install -D -m 644 swinventory.xml
$(DESTDIR)/etc/newisys/poci/swinventory.xml
+ < swinventory.xml > $(DESTDIR)/etc/newisys/poci/swinventory.xml
+ chmod 644 $(DESTDIR)/etc/newisys/poci/swinventory.xml
-uninstall: preuninstall
+uninstall:
rm -f $(DESTDIR)/usr/sbin/nws_mc
rm -f $(DESTDIR)/usr/sbin/nws_hb
rm -f $(DESTDIR)/usr/sbin/nws_poci
- rm -f $(DESTDIR)/etc/init.d/poci
+ rm -f $(DESTDIR)/etc/rc.d/init.d/poci
rm -rf $(DESTDIR)/etc/newisys/poci
-
-#
-# now add poci as a service
-#
-postinstall:
-ifeq (,$(BUILD_FROM_RPM))
- if [ -f $(DESTDIR)/etc/init.d/functions ] ; then \
- chkconfig --add poci ;\
- else \
- insserv $(DESTDIR)/etc/init.d/poci ;\
- fi
-endif
-
-#
-# check to see if poci is running...if so, stop it
-#
-preuninstall:
- if [ 'ps -Af | grep -v "grep" | grep -q "nws_poci"' ] ; then \
- $(DESTDIR)/etc/init.d/poci stop ;\
- fi ;\
- if [ -f $(DESTDIR)/etc/init.d/functions ] ; then \
- chkconfig --del poci ;\
- else \
- insserv -r $(DESTDIR)/etc/init.d/poci ;\
- fi
================================================================
---- CVS-web:
http://cvs.pld-linux.org/nps/poci/Makefile?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
