Author: baggins Date: Fri Sep 16 21:59:31 2005 GMT
Module: nps Tag: HEAD
---- Log message:
- started Makefile cleanup
---- Files affected:
nps:
Makefile (1.7 -> 1.8)
nps/poci:
Makefile (1.7 -> 1.8)
---- Diffs:
================================================================
Index: nps/Makefile
diff -u nps/Makefile:1.7 nps/Makefile:1.8
--- nps/Makefile:1.7 Tue Aug 2 13:14:56 2005
+++ nps/Makefile Fri Sep 16 23:59:26 2005
@@ -1,7 +1,7 @@
KERNEL_DIR=/usr/src/linux
TOPDIR=$(shell pwd)
-KERNEL_VERSION := $(shell grep UTS_RELEASE
$(KERNEL_DIR)/include/linux/version.h | sed -e 's/.*UTS_RELEASE
"\([0-9]*\.[0-9]*\)\..*"/\1/')
+KERNEL_VERSION := $(shell grep -m 1 UTS_RELEASE
$(KERNEL_DIR)/include/linux/version.h | sed -e 's/.*UTS_RELEASE
"\([0-9]*\.[0-9]*\)\..*"/\1/')
BUILD_ARCH := $(shell uname -m | sed 'y/-/_/')
SED_PWD := $(shell echo `pwd` | sed -e 's/\//\\\//g')
@@ -25,12 +25,12 @@
make install -C nws_mc ;\
fi
make install -C poci
- @mkdir -p $(INSTALL_MOD_PATH)/etc/newisys
+ @mkdir -p $(DESTDIR)/etc/newisys
sed -e "s/<SWInstalledDate>.*</<SWInstalledDate>`date +%s`</" \
-e "s/SWInfo\(.*\)</SWInfo\1 Source</" \
< common/swinventory.xml > common/swinventory.new
mv common/swinventory.new common/swinventory.xml
- install -D -m 644 common/swinventory.xml
$(INSTALL_MOD_PATH)/etc/newisys/swinventory.xml
+ install -D -m 644 common/swinventory.xml
$(DESTDIR)/etc/newisys/swinventory.xml
uninstall:
make uninstall -C poci
================================================================
Index: nps/poci/Makefile
diff -u nps/poci/Makefile:1.7 nps/poci/Makefile:1.8
--- nps/poci/Makefile:1.7 Tue Sep 13 18:16:18 2005
+++ nps/poci/Makefile Fri Sep 16 23:59:26 2005
@@ -19,7 +19,7 @@
KERNEL_DIR=/usr/src/linux
-KERNEL_VERSION := $(shell grep UTS_RELEASE
$(KERNEL_DIR)/include/linux/version.h | sed -e 's/.*UTS_RELEASE
"\([0-9]*\.[0-9]*\)\..*"/\1/')
+KERNEL_VERSION := $(shell grep -m 1 UTS_RELEASE
$(KERNEL_DIR)/include/linux/version.h | sed -e 's/.*UTS_RELEASE
"\([0-9]*\.[0-9]*\)\..*"/\1/')
BUILD_ARCH := $(shell uname -m | sed 'y/-/_/')
CC = gcc
@@ -55,18 +55,17 @@
install:
@mkdir -p $(DESTDIR)/usr/sbin
- @mkdir -p $(DESTDIR)/etc/init.d
+ @mkdir -p $(DESTDIR)/etc/rc.d/init.d
@mkdir -p $(DESTDIR)/etc/newisys/poci
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 $(DESTDIR)/etc/init.d
+ install -m744 script/poci.init $(DESTDIR)/etc/rc.d/init.d
sed -e "s/<SWInstalledDate>.*</<SWInstalledDate>`date +%s`</" \
-e "s/SWInfo\(.*\)</SWInfo\1 Source</" \
< swinventory.xml > swinventory.new
mv swinventory.new swinventory.xml
install -D -m 644 swinventory.xml
$(DESTDIR)/etc/newisys/poci/swinventory.xml
- make postinstall
uninstall: preuninstall
rm -f $(DESTDIR)/usr/sbin/nws_mc
================================================================
---- CVS-web:
http://cvs.pld-linux.org/nps/Makefile?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/nps/poci/Makefile?r1=1.7&r2=1.8&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
