]>
Commit | Line | Data |
---|---|---|
f0656be4 | 1 | diff -urN DQS3.orig/Makefile DQS3/Makefile |
2 | --- DQS3.orig/Makefile Wed Oct 21 19:39:14 1998 | |
3 | +++ DQS3/Makefile Thu May 10 12:49:46 2001 | |
4 | @@ -1,10 +1,11 @@ | |
5 | -INSTALL_DIR=/usr/local/DQS/bin | |
6 | -BIN_DIR=/usr/local/DQS/bin | |
7 | -CONF_DIR=/usr/local/DQS/common/conf | |
8 | -DOC_DIR=/usr/local/DQS/common/doc | |
9 | -LIB_DIR=/usr/local/DQS/local/lib | |
10 | -MAN1_DIR=/usr/local/DQS/man/man1 | |
11 | -MAN3_DIR=/usr/local/DQS/man/man3 | |
12 | +INSTALL_DIR=$(DESTDIR)/usr/bin | |
13 | +BIN_DIR=$(DESTDIR)/usr/bin | |
14 | +SBIN_DIR=$(DESTDIR)/usr/sbin | |
15 | +CONF_DIR=$(DESTDIR)/etc/dqs | |
16 | +DOC_DIR=$(DESTDIR)/usr/share/doc/dqs-3.3.2 | |
17 | +LIB_DIR=$(DESTDIR)/usr/lib | |
18 | +MAN1_DIR=$(DESTDIR)/usr/share/man/man1 | |
19 | +MAN3_DIR=$(DESTDIR)/usr/share/man/man3 | |
20 | ROOT=0 | |
21 | DQS_ROOT=0 | |
22 | SYSGRP=0 | |
23 | @@ -24,7 +25,7 @@ | |
24 | # dirs - Make Install Directories | |
25 | ||
26 | dirs: | |
27 | - -mkdir -p $(INSTALL_DIR) $(ARC_DIR) $(BIN_DIR) | |
28 | + -mkdir -p $(INSTALL_DIR) $(ARC_DIR) $(BIN_DIR) $(SBIN_DIR) | |
29 | -mkdir -p $(DOC_DIR) $(LIB_DIR) $(MAN1_DIR) $(MAN3_DIR) | |
30 | -mkdir -p $(CONF_DIR) | |
31 | -chmod 755 $(CONF_DIR) | |
32 | @@ -59,7 +60,7 @@ | |
33 | ||
34 | installbin: dirs | |
35 | UTIL/make_arcs make CC=$(CC) -f Makefile $@ \ | |
36 | - BIN_DIR=$(BIN_DIR) DQS_ROOT=$(DQS_ROOT) \ | |
37 | + BIN_DIR=$(BIN_DIR) SBIN_DIR=$(SBIN_DIR) DQS_ROOT=$(DQS_ROOT) \ | |
38 | DQS_SYSGRP=$(DQS_SYSGRP) | |
39 | ||
40 | #****************************************************** | |
41 | diff -urN DQS3.orig/SRC/Makefile DQS3/SRC/Makefile | |
42 | --- DQS3.orig/SRC/Makefile Fri Jul 2 17:06:53 1999 | |
43 | +++ DQS3/SRC/Makefile Thu May 10 12:36:19 2001 | |
44 | @@ -115,7 +115,7 @@ | |
45 | rm -f Makefile.c | |
46 | cp $(PROTO) Makefile.c | |
47 | echo "#define `../UTIL/config.guess 1`" | sed s/\\./_/g | sed s/-/_/g > Makefile.h | |
48 | - $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ | |
49 | + $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( SBIN_DIR )/(SBIN_DIR)/g'| sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ | |
50 | # rm -f Makefile.c | |
51 | @$(MAKE) -f Makefile.typ $@ | |
52 | ||
53 | @@ -123,14 +123,14 @@ | |
54 | rm -f Makefile.c | |
55 | cp $(PROTO) Makefile.c | |
56 | echo "#define `../UTIL/config.guess 1`" | sed s/\\./_/g | sed s/-/_/g > Makefile.h | |
57 | - $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ | |
58 | + $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( SBIN_DIR )/(SBIN_DIR)/g'| sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ | |
59 | @$(MAKE) -f Makefile.typ $@ | |
60 | ||
61 | .DEFAULT : | |
62 | rm -f Makefile.c | |
63 | cp $(PROTO) Makefile.c | |
64 | echo "#define `../UTIL/config.guess`" | sed s/\\./_/g | sed s/-/_/g > Makefile.h | |
65 | - $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ | |
66 | + $(CC) -E Makefile.c | sed 's/\/ /\//g' | sed 's/ \//\//g' | sed 's/ ( SBIN_DIR )/(SBIN_DIR)/g'| sed 's/ ( BIN_DIR )/(BIN_DIR)/g' > Makefile.typ | |
67 | # rm -f Makefile.c | |
68 | @$(MAKE) -f Makefile.typ $@ | |
69 | ||
70 | diff -urN DQS3.orig/SRC/Makefile.proto DQS3/SRC/Makefile.proto | |
71 | --- DQS3.orig/SRC/Makefile.proto Mon Dec 11 04:02:19 2000 | |
72 | +++ DQS3/SRC/Makefile.proto Thu May 10 12:37:33 2001 | |
73 | @@ -764,7 +764,7 @@ | |
74 | -rm -f $(BIN_DIR)/QMASTER_BIN $(BIN_DIR)/DSH_BIN | |
75 | -rm -f $(BIN_DIR)/PVM_CLEAN | |
76 | ||
77 | -installbin:: $(BIN_DIR)/QMASTER_BIN $(BIN_DIR)/QSUB_BIN $(BIN_DIR)/QSTAT_BIN | |
78 | +installbin:: $(SBIN_DIR)/QMASTER_BIN $(BIN_DIR)/QSUB_BIN $(BIN_DIR)/QSTAT_BIN | |
79 | ||
80 | installbin:: $(BIN_DIR)/DQS_EXECD_BIN $(BIN_DIR)/QDEL_BIN $(BIN_DIR)/QCONF_BIN | |
81 | ||
82 | @@ -785,8 +785,8 @@ | |
83 | $(BIN_DIR)/QALTER_BIN: qalter | |
84 | $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qalter $(BIN_DIR)/QALTER_BIN | |
85 | ||
86 | -$(BIN_DIR)/QMASTER_BIN: qmaster | |
87 | - $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0700 qmaster $(BIN_DIR)/QMASTER_BIN | |
88 | +$(SBIN_DIR)/QMASTER_BIN: qmaster | |
89 | + $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0700 qmaster $(SBIN_DIR)/QMASTER_BIN | |
90 | ||
91 | $(BIN_DIR)/QHOLD_BIN: qhold | |
92 | $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qhold $(BIN_DIR)/QHOLD_BIN | |
93 | @@ -801,10 +801,10 @@ | |
94 | $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qstat $(BIN_DIR)/QSTAT_BIN | |
95 | ||
96 | $(BIN_DIR)/QCONF_BIN: qconf | |
97 | - $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qconf $(BIN_DIR)/QCONF_BIN | |
98 | + $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 4755 qconf $(SBIN_DIR)/QCONF_BIN | |
99 | ||
100 | $(BIN_DIR)/DQS_EXECD_BIN: dqs_execd | |
101 | - $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 dqs_execd $(BIN_DIR)/DQS_EXECD_BIN | |
102 | + $(INSTALL) -o $(DQS_ROOT) -g $(DQS_SYSGRP) -m 0755 dqs_execd $(SBIN_DIR)/DQS_EXECD_BIN | |
103 | ||
104 | $(BIN_DIR)/PVM_CLEAN: ../UTIL/pvmcleanup.sh | |
105 | cp ../UTIL/pvmcleanup.sh . | |
106 | diff -urN DQS3.orig/UTIL/install DQS3/UTIL/install | |
107 | --- DQS3.orig/UTIL/install Tue Aug 18 16:39:14 1998 | |
108 | +++ DQS3/UTIL/install Wed May 9 23:42:13 2001 | |
109 | @@ -29,12 +29,6 @@ | |
110 | ||
111 | echo "------------$CP $1 $2" | |
112 | $CP $1 $2 | |
113 | -echo "------------$CHOWN $2" | |
114 | -$CHOWN $2 | |
115 | -echo "------------$CHGRP $2" | |
116 | -$CHGRP $2 | |
117 | -echo "------------$CHMOD $2" | |
118 | -$CHMOD $2 | |
119 | ||
120 | exit 0 | |
121 |