1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
| | Separate build-time from run-time binaries
diff --git a/Configure b/Configure
index 1ef9756..0b42b6b 100755
--- a/Configure
+++ b/Configure
@@ -12,36 +12,20 @@ VARPREFIX=${VARPREFIX:-"/var"}
FILE="Makefile.new"
CONFIG="config.h"
-RM=`which \rm`
-if [ -z "$RM" ];
-then
-echo "**ERROR**: Could not find rm"; exit;
-fi
-$RM -f $FILE
-$RM -f $CONFIG
+RM=
+rm -f $FILE
+rm -f $CONFIG
VERSION=2.023.6
echo "#define PREFIX \"$PREFIX\"" >> $CONFIG
echo "#define VARPREFIX \"$VARPREFIX\"" >> $CONFIG
echo "#define VERSION \"$VERSION\"" >> $CONFIG
echo "VERSION = $VERSION" >> $FILE
-GREP=`which \grep`
-if [ -z "$GREP" ];
-then
-echo "*WARNING*: Could not find grep --- will not be able to build new_data"
-fi
+GREP=
-GP=`which \gp`
-if [ -z "$GP" ];
-then
-echo "*WARNING*: Could not find gp --- will not be able to build new_data"
-fi
+GP=
-SED=`which \sed` && echo "SED = $SED" >> $FILE
-if [ -z "$SED" ];
-then
-echo "*WARNING*: Could not find sed --- will not be able to build new_data"
-fi
+SED=
if [ "x$ADDBINPATH" = "xyes" ]; then
echo "#define RM \"$RM\"" >> $CONFIG
@@ -58,9 +42,8 @@ fi
[ -n "$GREP" ] && [ -n "$GP" ] && [ -n "$SED" ]\
&& echo "#define NEW_DATA" >> $CONFIG
-SH=/bin/sh
+SH=
echo "#define SH \"$SH\"" >> $CONFIG
-echo "SH = $SH" >> $FILE
CC=${CC:-gcc} && echo "CC = $CC" >> $FILE
##if [ -z "$CC" ];
@@ -283,22 +266,6 @@ echo "TILDES = *~ datafiles/*~" >> $FILE
df="datafiles"
echo "DATAFILES = $df/*M.txt $df/*S.txt $df/param_data" >> $FILE
-echo "RM = $RM" >> $FILE
-CP=`which \cp` && echo "CP = $CP" >> $FILE
-if [ -z "$CP" ];
-then
-echo "**ERROR**: Could not find cp"; exit;
-fi
-MKDIR=`which \mkdir` && echo "MKDIR = $MKDIR" >> $FILE
-if [ -z "$MKDIR" ];
-then
-echo "**ERROR**: Could not find mkdir"; exit;
-fi
-TOUCH=`which \touch` && echo "TOUCH = $TOUCH" >> $FILE
-if [ -z "$TOUCH" ];
-then
-echo "**ERROR**: Could not find touch"; exit;
-fi
####TAR=`which \tar` && echo "TAR = $TAR" >> $FILE
####if [ -z "$TAR" ];
####then
@@ -319,19 +286,19 @@ echo " \$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(OPT) -o \$@ \$(DEFS) \$(OBJS) \$(LDFLAG
echo "%.o : %.c \$(HEADERS) Makefile" >> $FILE
echo " \$(CC) \$(CPPFLAGS) \$(CFLAGS) \$(OPT) \$(DEFS) -c -o \$@ \$<" >> $FILE
echo "datafiles/param_data: \$(OTHERb)" >> $FILE
-echo " \$(MKDIR) -p datafiles" >> $FILE
-echo " \$(TOUCH) datafiles/param_data" >> $FILE
-echo " \$(SH) armd.sh" >> $FILE
-echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE
+echo " mkdir -p datafiles" >> $FILE
+echo " touch datafiles/param_data" >> $FILE
+echo " sh armd.sh" >> $FILE
+echo " sed -i -e '/logfile =/d' datafiles/*.txt" >> $FILE
echo "sympow.1: sympow" >> $FILE
echo " \$(HELP2MAN) \$(H2MFLAGS) -s 1 -n \"SYMPOW program\" -I sympow.h2m -o \$@ ./\$<" >> $FILE
echo "clean:" >> $FILE
##echo " \$(RM) -f \$(OBJSf) sympow \$(TILDES) \$(TARS)" >> $FILE
-echo " \$(RM) -f \$(OBJS) sympow sympow.1 \$(TILDES)" >> $FILE
-echo " \$(RM) -rf datafiles" >> $FILE
+echo " rm -f \$(OBJS) sympow sympow.1 \$(TILDES)" >> $FILE
+echo " rm -rf datafiles" >> $FILE
echo "distclean: clean" >> $FILE
-echo " \$(RM) -f \$(CONFEXE)" >> $FILE
-echo " \$(RM) -f config.h Makefile" >> $FILE
+echo " rm -f \$(CONFEXE)" >> $FILE
+echo " rm -f config.h Makefile" >> $FILE
echo "install-arch: build-arch" >> $FILE
echo " install -d \$(DESTDIR)$PREFIX/bin" >> $FILE
echo " install -d \$(DESTDIR)$PREFIX/share/man/man1" >> $FILE
@@ -361,9 +328,9 @@ echo "install: install-arch install-indep" >> $FILE
####echo " \$(RM) -rf \$(WDIR)" >> $FILE
####fi
-$RM -f Makefile
-$CP -f Makefile.new Makefile
-$RM -f Makefile.new
+rm -f Makefile
+cp -f Makefile.new Makefile
+rm -f Makefile.new
echo "Makefile has been re-made. Use make if you wish to build SYMPOW"
echo ""
|