Lines 1-5
Link Here
|
1 |
--- Makefile.orig 2008-02-03 19:23:03.000000000 +0100 |
1 |
--- Makefile.orig 2008-02-03 13:23:03.000000000 -0500 |
2 |
+++ Makefile 2008-02-19 18:02:58.000000000 +0100 |
2 |
+++ Makefile 2008-02-21 19:51:31.000000000 -0500 |
3 |
@@ -1,106 +1,29 @@ |
3 |
@@ -1,106 +1,29 @@ |
4 |
-# bin, man and cron dirs |
4 |
-# bin, man and cron dirs |
5 |
-BIN = $(DESTDIR)/usr/bin |
5 |
-BIN = $(DESTDIR)/usr/bin |
Lines 93-101
Link Here
|
93 |
- @if [ `grep -c vnstat /etc/crontab` -eq 0 ]; \ |
93 |
- @if [ `grep -c vnstat /etc/crontab` -eq 0 ]; \ |
94 |
- then cat cron/vnstat >>/etc/crontab; \ |
94 |
- then cat cron/vnstat >>/etc/crontab; \ |
95 |
- sed -i "" -e 's/lib\/vnstat/db\/vnstat/g' -e 's/\/usr\/bin\/vnstat/\/usr\/local\/bin\/vnstat/g' /etc/crontab; \ |
95 |
- sed -i "" -e 's/lib\/vnstat/db\/vnstat/g' -e 's/\/usr\/bin\/vnstat/\/usr\/local\/bin\/vnstat/g' /etc/crontab; \ |
96 |
+ @if [ ! -f ${PREFIX}/etc/vnstat.conf ]; \ |
96 |
+ @if [ ! -f ${PREFIX}/etc/vnstat.conf.sample ]; \ |
97 |
+ then install -m 644 cfg/vnstat.conf ${PREFIX}/etc; \ |
97 |
+ then install -m 644 cfg/vnstat.conf ${PREFIX}/etc/vnstat.conf.sample; \ |
98 |
+ sed -i "" -e 's/lib/db/g' ${PREFIX}/etc/vnstat.conf; \ |
98 |
+ sed -i "" -e 's/lib/db/g' ${PREFIX}/etc/vnstat.conf.sample; \ |
99 |
fi |
99 |
fi |
100 |
|
100 |
|
101 |
# update man page |
101 |
# update man page |
Lines 120-123
Link Here
|
120 |
- @echo "The cron entry from /etc/crontab needs to be removed manually." |
120 |
- @echo "The cron entry from /etc/crontab needs to be removed manually." |
121 |
+ rm -f ${PREFIX}/bin/vnstat |
121 |
+ rm -f ${PREFIX}/bin/vnstat |
122 |
+ rm -f ${PREFIX}/man/man1/vnstat.1* |
122 |
+ rm -f ${PREFIX}/man/man1/vnstat.1* |
123 |
+ rm -f ${PREFIX}/etc/vnstat.conf |
123 |
+ rm -f ${PREFIX}/etc/vnstat.conf.sample |